diff --git a/[refs] b/[refs] index 51e65d0f228e..eba504951aae 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f0a0ba6d69882ae14f24d7eb6e2ae07f30fbd56a +refs/heads/master: cb4a10ccb0c5b5b02dec1a4a97cba1e8b2c2a325 diff --git a/trunk/drivers/char/isicom.c b/trunk/drivers/char/isicom.c index 42171ad001dd..eddb8d3a620e 100644 --- a/trunk/drivers/char/isicom.c +++ b/trunk/drivers/char/isicom.c @@ -540,6 +540,11 @@ static irqreturn_t isicom_interrupt(int irq, void *dev_id) return IRQ_NONE; base = card->base; + + /* did the card interrupt us? */ + if (!(inw(base + 0x0e) & 0x02)) + return IRQ_NONE; + spin_lock(&card->card_lock); /*