Skip to content

Commit

Permalink
libertas: fix interrupt while removing driver
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Holger Schurig authored and David S. Miller committed Feb 1, 2008
1 parent 5a6e043 commit fdfb92e
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions drivers/net/wireless/libertas/if_cs.c
Original file line number Diff line number Diff line change
Expand Up @@ -249,14 +249,14 @@ static irqreturn_t if_cs_interrupt(int irq, void *data)
lbs_deb_enter(LBS_DEB_CS);

int_cause = if_cs_read16(card, IF_CS_C_INT_CAUSE);
if(int_cause == 0x0) {
if (int_cause == 0x0) {
/* Not for us */
return IRQ_NONE;

} else if (int_cause == 0xffff) {
/* Read in junk, the card has probably been removed */
card->priv->surpriseremoved = 1;

return IRQ_HANDLED;
} else {
if (int_cause & IF_CS_H_IC_TX_OVER)
lbs_host_to_card_done(card->priv);
Expand Down Expand Up @@ -717,8 +717,8 @@ static void if_cs_release(struct pcmcia_device *p_dev)

lbs_deb_enter(LBS_DEB_CS);

pcmcia_disable_device(p_dev);
free_irq(p_dev->irq.AssignedIRQ, card);
pcmcia_disable_device(p_dev);
if (card->iobase)
ioport_unmap(card->iobase);

Expand Down

0 comments on commit fdfb92e

Please sign in to comment.