diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-01-10 21:41:39 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-01-10 21:41:39 -0500 |
| commit | abede81c4fb2e3b85d8760f25e3da39d2c69a134 (patch) | |
| tree | 26c893ec108d837eb9171d678c55a1cea7b22af4 /drivers/pci/hotplug/fakephp.c | |
| parent | c9d557c19f94df42db78d4a5de4d25feee694bad (diff) | |
| parent | c59765042f53a79a7a65585042ff463b69cb248c (diff) | |
Merge commit 'v2.6.29-rc1' into core/urgent
Diffstat (limited to 'drivers/pci/hotplug/fakephp.c')
| -rw-r--r-- | drivers/pci/hotplug/fakephp.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/pci/hotplug/fakephp.c b/drivers/pci/hotplug/fakephp.c index 3a2637a00934..b0e7de9e536d 100644 --- a/drivers/pci/hotplug/fakephp.c +++ b/drivers/pci/hotplug/fakephp.c | |||
| @@ -324,6 +324,7 @@ static int disable_slot(struct hotplug_slot *slot) | |||
| 324 | 324 | ||
| 325 | if (test_and_set_bit(0, &dslot->removed)) { | 325 | if (test_and_set_bit(0, &dslot->removed)) { |
| 326 | dbg("Slot already scheduled for removal\n"); | 326 | dbg("Slot already scheduled for removal\n"); |
| 327 | pci_dev_put(dev); | ||
| 327 | return -ENODEV; | 328 | return -ENODEV; |
| 328 | } | 329 | } |
| 329 | 330 | ||