Browse Source

[PATCH] broken error path in drivers/pnp/card.c

The error path in pnp_request_card_device() is broken (one variable is
left initialized and the semaphore is not unlocked).

This fixes it (and has been tested).

Signed-off-by: Jaroslav Kysela <perex@suse.cz>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Jaroslav Kysela 20 years ago
parent
commit
30d5b64b63
1 changed files with 2 additions and 0 deletions
  1. 2 0
      drivers/pnp/card.c

+ 2 - 0
drivers/pnp/card.c

@@ -312,6 +312,8 @@ found:
 	if (drv->link.driver.probe) {
 	if (drv->link.driver.probe) {
 		if (drv->link.driver.probe(&dev->dev)) {
 		if (drv->link.driver.probe(&dev->dev)) {
 			dev->dev.driver = NULL;
 			dev->dev.driver = NULL;
+			dev->card_link = NULL;
+			up_write(&dev->dev.bus->subsys.rwsem);
 			return NULL;
 			return NULL;
 		}
 		}
 	}
 	}