diff options
| author | Lachlan McIlroy <lachlan@redback.melbourne.sgi.com> | 2008-02-25 22:26:14 -0500 |
|---|---|---|
| committer | Lachlan McIlroy <lachlan@redback.melbourne.sgi.com> | 2008-02-25 22:26:14 -0500 |
| commit | 91e229bbad6524aabaac8717b2f559283670c37a (patch) | |
| tree | 84a55e4ac2dcf23add97bd9fde3e9cb232c12b30 /drivers/pci/proc.c | |
| parent | 6e5e93424dc66542c548dfaa3bfebe30d46d50dd (diff) | |
| parent | bfa274e2436fc7ef72ef51c878083647f1cfd429 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into for-linus
Diffstat (limited to 'drivers/pci/proc.c')
| -rw-r--r-- | drivers/pci/proc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/pci/proc.c b/drivers/pci/proc.c index 68aeeb7206de..ef18fcd641e2 100644 --- a/drivers/pci/proc.c +++ b/drivers/pci/proc.c | |||
| @@ -422,7 +422,7 @@ int pci_proc_detach_device(struct pci_dev *dev) | |||
| 422 | struct proc_dir_entry *e; | 422 | struct proc_dir_entry *e; |
| 423 | 423 | ||
| 424 | if ((e = dev->procent)) { | 424 | if ((e = dev->procent)) { |
| 425 | if (atomic_read(&e->count)) | 425 | if (atomic_read(&e->count) > 1) |
| 426 | return -EBUSY; | 426 | return -EBUSY; |
| 427 | remove_proc_entry(e->name, dev->bus->procdir); | 427 | remove_proc_entry(e->name, dev->bus->procdir); |
| 428 | dev->procent = NULL; | 428 | dev->procent = NULL; |