diff options
| author | David Woodhouse <dwmw2@infradead.org> | 2007-12-10 14:58:37 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-01-28 15:06:35 -0800 |
| commit | 4f679496567809ce1e95730c25274e1832537f4b (patch) | |
| tree | e46717a8df0eda9e741098ddaf56b7e1c36ab580 /drivers/net/wireless/libertas/if_cs.c | |
| parent | 1309b55b4de18bbfe19c73225a5481d6cdc8a463 (diff) | |
libertas: clean up lbs_interrupt()
Make it take struct lbs_private as argument; that's all it wants anyway,
and all callers were starting off from that. Don't wake the netif
queues, because those should be handled elsewhere. And sort out the
locking, with a big nasty warning for those who don't have the
driver_lock locked when they call it.
Oh, and fix if_cs.c to lock the driver_lock before calling it.
Signed-off-by: David Woodhouse <dwmw2@infradead.org>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/libertas/if_cs.c')
| -rw-r--r-- | drivers/net/wireless/libertas/if_cs.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/net/wireless/libertas/if_cs.c b/drivers/net/wireless/libertas/if_cs.c index 49a01780dd03..2acbe5dcff7d 100644 --- a/drivers/net/wireless/libertas/if_cs.c +++ b/drivers/net/wireless/libertas/if_cs.c @@ -264,8 +264,9 @@ static irqreturn_t if_cs_interrupt(int irq, void *data) /* clear interrupt */ if_cs_write16(card, IF_CS_C_INT_CAUSE, int_cause & IF_CS_C_IC_MASK); } - - lbs_interrupt(card->priv->dev); + spin_lock(&card->priv->driver_lock); + lbs_interrupt(card->priv); + spin_unlock(&card->priv->driver_lock); return IRQ_HANDLED; } |