diff options
| author | David S. Miller <davem@davemloft.net> | 2013-08-04 06:36:46 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2013-08-04 06:36:46 +0200 |
| commit | 0e76a3a587fc7abda2badf249053b427baad255e (patch) | |
| tree | 646a1da67dc25654552028225ca4b7a0a8043cc9 /drivers/net/ethernet/broadcom/tg3.c | |
| parent | fib_rules: reorder struct fib_rules fields (diff) | |
| parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net (diff) | |
| download | linux-0e76a3a587fc7abda2badf249053b427baad255e.tar.xz linux-0e76a3a587fc7abda2badf249053b427baad255e.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Merge net into net-next to setup some infrastructure Eric
Dumazet needs for usbnet changes.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/broadcom/tg3.c')
| -rw-r--r-- | drivers/net/ethernet/broadcom/tg3.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/net/ethernet/broadcom/tg3.c b/drivers/net/ethernet/broadcom/tg3.c index 2aa8624abce3..51bf9ca42faf 100644 --- a/drivers/net/ethernet/broadcom/tg3.c +++ b/drivers/net/ethernet/broadcom/tg3.c @@ -17670,7 +17670,8 @@ err_out_free_res: pci_release_regions(pdev); err_out_disable_pdev: - pci_disable_device(pdev); + if (pci_is_enabled(pdev)) + pci_disable_device(pdev); pci_set_drvdata(pdev, NULL); return err; } @@ -17835,7 +17836,8 @@ static pci_ers_result_t tg3_io_error_detected(struct pci_dev *pdev, rtnl_lock(); - if (!netif_running(netdev)) + /* We probably don't have netdev yet */ + if (!netdev || !netif_running(netdev)) goto done; tg3_phy_stop(tp); |