diff options
| author | Len Brown <len.brown@intel.com> | 2005-08-24 04:12:23 +0200 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2005-08-24 04:12:23 +0200 |
| commit | 84ffa747520edd4556b136bdfc9df9eb1673ce12 (patch) | |
| tree | 1cfe20bd31fce1b5b3024384fcb324c3338d1d32 /drivers/pnp | |
| parent | [ACPI] fix ia64 build issues resulting from Lindent and merge (diff) | |
| parent | [PATCH] zd1201 kmalloc size fix (diff) | |
| download | linux-84ffa747520edd4556b136bdfc9df9eb1673ce12.tar.xz linux-84ffa747520edd4556b136bdfc9df9eb1673ce12.zip | |
Merge from-linus to-akpm
Diffstat (limited to 'drivers/pnp')
| -rw-r--r-- | drivers/pnp/card.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/pnp/card.c b/drivers/pnp/card.c index add12f7c489a..6e5229e92fbc 100644 --- a/drivers/pnp/card.c +++ b/drivers/pnp/card.c @@ -312,6 +312,8 @@ found: if (drv->link.driver.probe) { if (drv->link.driver.probe(&dev->dev)) { dev->dev.driver = NULL; + dev->card_link = NULL; + up_write(&dev->dev.bus->subsys.rwsem); return NULL; } } |