diff options
| author |   David S. Miller <davem@davemloft.net> | 2016-10-14 10:00:27 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2016-10-14 10:00:27 -0400 |
| commit | 8eed1cd4cd0c6f41d40c345265f20dc7688ffcca (patch) | |
| tree | 5adaacccdc1e519e3861b8f7333f39350205a472 /drivers/net/ethernet/ti/tlan.c | |
| parent | Merge branch 's390-net' (diff) | |
| parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net (diff) | |
| download | linux-dev-8eed1cd4cd0c6f41d40c345265f20dc7688ffcca.tar.xz linux-dev-8eed1cd4cd0c6f41d40c345265f20dc7688ffcca.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Diffstat (limited to 'drivers/net/ethernet/ti/tlan.c')
| -rw-r--r-- | drivers/net/ethernet/ti/tlan.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/ethernet/ti/tlan.c b/drivers/net/ethernet/ti/tlan.c index 4a3eeb10d45b..c8d53d8c83ee 100644 --- a/drivers/net/ethernet/ti/tlan.c +++ b/drivers/net/ethernet/ti/tlan.c @@ -610,8 +610,8 @@ err_out_regions: #ifdef CONFIG_PCI if (pdev) pci_release_regions(pdev); -#endif err_out: +#endif if (pdev) pci_disable_device(pdev); return rc; |