Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8b613e1c authored by Adam Belay's avatar Adam Belay Committed by Linus Torvalds
Browse files

[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: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 15b370c9

drivers/pnp/card.c

+5 −7
Original line number Diff line number Diff line
@@ -303,14 +303,12 @@ found: 
	down_write(&dev->dev.bus->subsys.rwsem);

	dev->card_link = clink;

	dev->dev.driver = &drv->link.driver;

	if (drv->link.driver.probe) {

		if (drv->link.driver.probe(&dev->dev)) {

	if (pnp_bus_type.probe(&dev->dev)) {

		dev->dev.driver = NULL;

		dev->card_link = NULL;

		up_write(&dev->dev.bus->subsys.rwsem);

		return NULL;

	}

	}

	device_bind_driver(&dev->dev);

	up_write(&dev->dev.bus->subsys.rwsem);