linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Dominik Brodowski <linux@dominikbrodowski.net>
To: "Justin P. Mattock" <justinmattock@gmail.com>
Cc: Jens.Kuenzer@fpga.homeip.net, linux-pcmcia@lists.infradead.org,
	linux-kernel@vger.kernel.org
Subject: Re: [PATCH][bisected]pcmcia:yenta_socket.c fix broken wireless cards.
Date: Fri, 21 May 2010 15:16:38 +0200	[thread overview]
Message-ID: <20100521131638.GA22685@comet.dominikbrodowski.net> (raw)
In-Reply-To: <4BF5974A.4050100@gmail.com> <4BF57515.6030404@gmail.com>

Justin,

would you be willing to test another patch? This one replaces the previous
version, and makes the readb() conditional at the right place (hopefully,
that is).

Thanks & best,

	Dominik


diff --git a/drivers/pcmcia/yenta_socket.c b/drivers/pcmcia/yenta_socket.c
index 424e576..6bf8b2c 100644
--- a/drivers/pcmcia/yenta_socket.c
+++ b/drivers/pcmcia/yenta_socket.c
@@ -975,7 +975,7 @@ static irqreturn_t yenta_probe_handler(int irq, void *dev_id)
 /* probes the PCI interrupt, use only on override functions */
 static int yenta_probe_cb_irq(struct yenta_socket *socket)
 {
-	u8 reg;
+	u8 reg = 0;
 
 	if (!socket->cb_irq)
 		return -1;
@@ -989,7 +989,8 @@ static int yenta_probe_cb_irq(struct yenta_socket *socket)
 	}
 
 	/* generate interrupt, wait */
-	reg = exca_readb(socket, I365_CSCINT);
+	if (!socket->dev->irq)
+		reg = exca_readb(socket, I365_CSCINT);
 	exca_writeb(socket, I365_CSCINT, reg | I365_CSC_STSCHG);
 	cb_writel(socket, CB_SOCKET_EVENT, -1);
 	cb_writel(socket, CB_SOCKET_MASK, CB_CSTSMASK);

  reply	other threads:[~2010-05-21 13:21 UTC|newest]

Thread overview: 8+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2010-05-19 21:08 [PATCH][bisected]pcmcia:yenta_socket.c fix broken wireless cards Justin P. Mattock
2010-05-20 14:54 ` Dominik Brodowski
2010-05-20 15:52   ` Justin P. Mattock
2010-05-20 16:34     ` Dominik Brodowski
2010-05-20 16:46       ` Justin P. Mattock
2010-05-20 17:44       ` Justin P. Mattock
2010-05-21 13:16         ` Dominik Brodowski [this message]
2010-05-20 20:10       ` Justin P. Mattock

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20100521131638.GA22685@comet.dominikbrodowski.net \
    --to=linux@dominikbrodowski.net \
    --cc=Jens.Kuenzer@fpga.homeip.net \
    --cc=justinmattock@gmail.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-pcmcia@lists.infradead.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).