From: Mark Brown Date: Wed, 10 Oct 2007 16:11:12 +0000 (+0100) Subject: natsemi: Check return value for pci_enable_device() X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=a8a935dae5de65a8f5a5371a58ad2aa73a0ea2da;p=GitHub%2Fmt8127%2Fandroid_kernel_alcatel_ttab.git natsemi: Check return value for pci_enable_device() pci_enable_device() is __must_check so do that in natsemi_resume(). Signed-off-by: Mark Brown Signed-off-by: Jeff Garzik --- diff --git a/drivers/net/natsemi.c b/drivers/net/natsemi.c index b881786eebd4..50e1ec67ef9c 100644 --- a/drivers/net/natsemi.c +++ b/drivers/net/natsemi.c @@ -3314,13 +3314,19 @@ static int natsemi_resume (struct pci_dev *pdev) { struct net_device *dev = pci_get_drvdata (pdev); struct netdev_private *np = netdev_priv(dev); + int ret = 0; rtnl_lock(); if (netif_device_present(dev)) goto out; if (netif_running(dev)) { BUG_ON(!np->hands_off); - pci_enable_device(pdev); + ret = pci_enable_device(pdev); + if (ret < 0) { + dev_err(&pdev->dev, + "pci_enable_device() failed: %d\n", ret); + goto out; + } /* pci_power_on(pdev); */ napi_enable(&np->napi); @@ -3340,7 +3346,7 @@ static int natsemi_resume (struct pci_dev *pdev) netif_device_attach(dev); out: rtnl_unlock(); - return 0; + return ret; } #endif /* CONFIG_PM */