Eric Lee / linux-smarc-t335x-v3.2

Download as
Browse Code ยป

Commit 8b613e1ccf1b7ac9acc73eaa07f5aeffd3c2bb8d

Authored by Adam Belay
Committed by Linus Torvalds
1 parent 15b370c95c
Exists in master and in 4 other branches v3.2_AM335xPSP_04.06.00.11, v3.2_NEWT335xPSP_04.06.00.11, v3.2_SBC_SMARTMEN, v3.2_SMARCT335xPSP_04.06.00.11

[PATCH] pnp bus type fix 

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>

Showing 1 changed file with 5 additions and 7 deletions Side-by-side Diff

... ... @@ -303,13 +303,11 @@
303 303 down_write(&dev->dev.bus->subsys.rwsem);
304 304 dev->card_link = clink;
305 305 dev->dev.driver = &drv->link.driver;
306   - if (drv->link.driver.probe) {
307   - if (drv->link.driver.probe(&dev->dev)) {
308   - dev->dev.driver = NULL;
309   - dev->card_link = NULL;
310   - up_write(&dev->dev.bus->subsys.rwsem);
311   - return NULL;
312   - }
  306 + if (pnp_bus_type.probe(&dev->dev)) {
  307 + dev->dev.driver = NULL;
  308 + dev->card_link = NULL;
  309 + up_write(&dev->dev.bus->subsys.rwsem);
  310 + return NULL;
313 311 }
314 312 device_bind_driver(&dev->dev);
315 313 up_write(&dev->dev.bus->subsys.rwsem);