Jens, Justin,
could both of you test this patch on top of 2.6.34, please?
pcmcia: only keep saved I365_CSCING flag if there is no PCI irq
Signed-off-by: Dominik Brodowski<linux@xxxxxxxxxxxxxxxxxxxx>
diff --git a/drivers/pcmcia/yenta_socket.c b/drivers/pcmcia/yenta_socket.c
index 424e576..151ca43 100644
--- a/drivers/pcmcia/yenta_socket.c
+++ b/drivers/pcmcia/yenta_socket.c
@@ -371,8 +371,11 @@ static int yenta_set_socket(struct pcmcia_socket *sock, socket_state_t *state)
exca_writeb(socket, I365_POWER, reg);
/* CSC interrupt: no ISA irq for CSC */
- reg = exca_readb(socket, I365_CSCINT);
- reg&= I365_CSC_IRQ_MASK;
+ reg = 0;
+ if (!socket->dev->irq) {
+ reg = exca_readb(socket, I365_CSCINT);
+ reg&= I365_CSC_IRQ_MASK;
+ }
reg |= I365_CSC_DETECT;
if (state->flags& SS_IOCARD) {
if (state->csc_mask& SS_STSCHG)