diff options
| author | Akinobu Mita <akinobu.mita@gmail.com> | 2006-11-08 19:53:59 -0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2006-12-01 14:36:58 -0800 |
| commit | 50bf14b3ff05fb6e10688021b96f95d30a300f8d (patch) | |
| tree | 0f1ffcaf0180746959ed0dee88c6153bb8ed4744 /drivers/pci | |
| parent | 0dcb2b7e722f62b886f28b01150860de67d219fa (diff) | |
| download | linux-3.10-50bf14b3ff05fb6e10688021b96f95d30a300f8d.tar.gz linux-3.10-50bf14b3ff05fb6e10688021b96f95d30a300f8d.tar.bz2 linux-3.10-50bf14b3ff05fb6e10688021b96f95d30a300f8d.zip | |
pci: fix __pci_register_driver error handling
__pci_register_driver() error path forgot to unwind.
driver_unregister() needs to be called when pci_create_newid_file() failed.
Signed-off-by: Akinobu Mita <akinobu.mita@gmail.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/pci')
| -rw-r--r-- | drivers/pci/pci-driver.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/drivers/pci/pci-driver.c b/drivers/pci/pci-driver.c index 194f1d21d3d..84ec9c8f670 100644 --- a/drivers/pci/pci-driver.c +++ b/drivers/pci/pci-driver.c @@ -445,9 +445,12 @@ int __pci_register_driver(struct pci_driver *drv, struct module *owner) /* register with core */ error = driver_register(&drv->driver); + if (error) + return error; - if (!error) - error = pci_create_newid_file(drv); + error = pci_create_newid_file(drv); + if (error) + driver_unregister(&drv->driver); return error; } |