diff options
| author | Daniel Silverstone <daniel.silverstone@codethink.co.uk> | 2014-09-23 13:22:00 +0000 |
|---|---|---|
| committer | Daniel Silverstone <daniel.silverstone@codethink.co.uk> | 2014-09-23 13:22:00 +0000 |
| commit | cfb0ae67faf0630806e9b3775448521b9b25b66d (patch) | |
| tree | 0cf03378772ba2d00e557d1d88166361e6fc9414 /drivers/pci/pci-driver.c | |
| parent | 8c468766a1521b33b55a21d518638c60989599c0 (diff) | |
| parent | 27eb7634a69774beee6743fdf70d431e502b9e9f (diff) | |
| download | linux-cfb0ae67faf0630806e9b3775448521b9b25b66d.tar.gz | |
Merge remote-tracking branch 'pci/next' into ct-mcr-1/danielsilverstone/jetson-genivi
Diffstat (limited to 'drivers/pci/pci-driver.c')
| -rw-r--r-- | drivers/pci/pci-driver.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/drivers/pci/pci-driver.c b/drivers/pci/pci-driver.c index d04c5adafc16..2b3c89425bb5 100644 --- a/drivers/pci/pci-driver.c +++ b/drivers/pci/pci-driver.c @@ -55,7 +55,6 @@ int pci_add_dynid(struct pci_driver *drv, unsigned long driver_data) { struct pci_dynid *dynid; - int retval; dynid = kzalloc(sizeof(*dynid), GFP_KERNEL); if (!dynid) @@ -73,9 +72,7 @@ int pci_add_dynid(struct pci_driver *drv, list_add_tail(&dynid->node, &drv->dynids.list); spin_unlock(&drv->dynids.lock); - retval = driver_attach(&drv->driver); - - return retval; + return driver_attach(&drv->driver); } EXPORT_SYMBOL_GPL(pci_add_dynid); |