lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[PATCH] pnp bus type fix

Browse Source 
This is Adam's pnp probing fix.  It's been reported to fix hangs on several
people's machines.  I don't know if it's official or final, and Adam isn't
contactable at present.  But I'm not aware of the patch causing any
regressions.

Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:
Adam Belay
2006-02-28 16:59:10 -08:00
committed by Linus Torvalds
parent 15b370c95c
commit 8b613e1ccf
1 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
drivers/pnp/card.c
View File

@@ -303,13 +303,11 @@ found:
down_write(&dev->dev.bus->subsys.rwsem); down_write(&dev->dev.bus->subsys.rwsem);
dev->card_link = clink; dev->card_link = clink;
dev->dev.driver = &drv->link.driver; dev->dev.driver = &drv->link.driver;
if (drv->link.driver.probe) { if (pnp_bus_type.probe(&dev->dev)) {
if (drv->link.driver.probe(&dev->dev)) { dev->dev.driver = NULL;
dev->dev.driver = NULL; dev->card_link = NULL;
dev->card_link = NULL; up_write(&dev->dev.bus->subsys.rwsem);
up_write(&dev->dev.bus->subsys.rwsem); return NULL;
return NULL;
}
} }
device_bind_driver(&dev->dev); device_bind_driver(&dev->dev);
up_write(&dev->dev.bus->subsys.rwsem); up_write(&dev->dev.bus->subsys.rwsem);