Skip to content

Commit

Permalink
pcmcia: only keep saved I365_CSCINT flag if there is no PCI irq
Browse files Browse the repository at this point in the history
Keeping the saved I365_CSCINT flag around breaks PCMCIA on some system,
and is only needed on a few systems to get PCMCIA to work. This patch
allows PCMCIA to work on both types, and it fixes
https://bugzilla.kernel.org/show_bug.cgi?id=16015

Reported-by: Justin P. Mattock <justinmattock@gmail.com>
CC: <stable@kernel.org>
Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net>
  • Loading branch information
Dominik Brodowski committed Jun 7, 2010
1 parent e44a21b commit 02caa56
Showing 1 changed file with 3 additions and 2 deletions.
5 changes: 3 additions & 2 deletions drivers/pcmcia/yenta_socket.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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);
Expand Down

0 comments on commit 02caa56

Please sign in to comment.