diff options
author | Paul Walmsley <paul@booyaka.com> | 2007-05-09 12:47:16 -0400 |
---|---|---|
committer | Jeff Garzik <jeff@garzik.org> | 2007-05-09 19:25:15 -0400 |
commit | 5bebf82fff53a96f330c0879ffe870bdf3aaeab6 (patch) | |
tree | d5ddfcb318dbb008acb6618e80fccbacd3f5cebf | |
parent | 5b982c5bb7db5cfbc15236d9d45cec32e5472ed5 (diff) |
Fix hang on IBM Token Ring PCMCIA card ejection
Ejecting a PCMCIA IBM Token Ring card that has not had its dev->open()
called will reliably trigger an uninitialized spinlock oops when
spinlock debugging is enabled. The system then hangs, occasionally
softlockup oopsing. Apparently ibmtr.c:tok_interrupt() doesn't expect
to be called before tok_open(), but tok_interrupt() gets called anyway
when the card is ejected. So, set an already-existing flag which
causes tok_interrupt() to bail out early upon card ejection. Tested by
inserting and removing the PCMCIA card several times.
Signed-off-by: Paul Walmsley <paul@booyaka.com>
Signed-off-by: Jeff Garzik <jeff@garzik.org>
-rw-r--r-- | drivers/net/pcmcia/ibmtr_cs.c | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/drivers/net/pcmcia/ibmtr_cs.c b/drivers/net/pcmcia/ibmtr_cs.c index 1060154ae750..4ecb8ca5a992 100644 --- a/drivers/net/pcmcia/ibmtr_cs.c +++ b/drivers/net/pcmcia/ibmtr_cs.c | |||
@@ -189,16 +189,20 @@ static void ibmtr_detach(struct pcmcia_device *link) | |||
189 | { | 189 | { |
190 | struct ibmtr_dev_t *info = link->priv; | 190 | struct ibmtr_dev_t *info = link->priv; |
191 | struct net_device *dev = info->dev; | 191 | struct net_device *dev = info->dev; |
192 | struct tok_info *ti = netdev_priv(dev); | ||
192 | 193 | ||
193 | DEBUG(0, "ibmtr_detach(0x%p)\n", link); | 194 | DEBUG(0, "ibmtr_detach(0x%p)\n", link); |
195 | |||
196 | /* | ||
197 | * When the card removal interrupt hits tok_interrupt(), | ||
198 | * bail out early, so we don't crash the machine | ||
199 | */ | ||
200 | ti->sram_phys |= 1; | ||
194 | 201 | ||
195 | if (link->dev_node) | 202 | if (link->dev_node) |
196 | unregister_netdev(dev); | 203 | unregister_netdev(dev); |
197 | 204 | ||
198 | { | 205 | del_timer_sync(&(ti->tr_timer)); |
199 | struct tok_info *ti = netdev_priv(dev); | ||
200 | del_timer_sync(&(ti->tr_timer)); | ||
201 | } | ||
202 | 206 | ||
203 | ibmtr_release(link); | 207 | ibmtr_release(link); |
204 | 208 | ||