UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

libertas: fix interrupt while removing driver 

Previously I've got an interrupt while removing the driver.

Signed-off-by: Holger Schurig <hs4233@mail.mn-solutions.de>
Acked-by: Dan Williams <dcbw@redhat.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Holger Schurig 2008-01-25 14:15:48 +01:00 committed by David S. Miller
parent 5a6e04345a
commit fdfb92eab5
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/net/wireless/libertas/if_cs.c
View File

@ -249,14 +249,14 @@ static irqreturn_t if_cs_interrupt(int irq, void *data)
lbs_deb_enter(LBS_DEB_CS); lbs_deb_enter(LBS_DEB_CS);
int_cause = if_cs_read16(card, IF_CS_C_INT_CAUSE); int_cause = if_cs_read16(card, IF_CS_C_INT_CAUSE);
if(int_cause == 0x0) { if (int_cause == 0x0) {
/* Not for us */ /* Not for us */
return IRQ_NONE; return IRQ_NONE;
} else if (int_cause == 0xffff) { } else if (int_cause == 0xffff) {
/* Read in junk, the card has probably been removed */ /* Read in junk, the card has probably been removed */
card->priv->surpriseremoved = 1; card->priv->surpriseremoved = 1;
return IRQ_HANDLED;
} else { } else {
if (int_cause & IF_CS_H_IC_TX_OVER) if (int_cause & IF_CS_H_IC_TX_OVER)
lbs_host_to_card_done(card->priv); lbs_host_to_card_done(card->priv);
@ -717,8 +717,8 @@ static void if_cs_release(struct pcmcia_device *p_dev)
lbs_deb_enter(LBS_DEB_CS); lbs_deb_enter(LBS_DEB_CS);
pcmcia_disable_device(p_dev);
free_irq(p_dev->irq.AssignedIRQ, card); free_irq(p_dev->irq.AssignedIRQ, card);
pcmcia_disable_device(p_dev);
if (card->iobase) if (card->iobase)
ioport_unmap(card->iobase); ioport_unmap(card->iobase);