Re: [PATCH] sk98lin: handle pci_enable_device() return value in skge_resume() properly

[Jiri Kosina]

On Thu, 12 Oct 2006, Andrew Morton wrote:

> >     pci_set_power_state(pdev, PCI_D0);
> >     pci_restore_state(pdev);
> > -   pci_enable_device(pdev);
> > +   ret = pci_enable_device(pdev);
> > +   if (ret) {
> > +           printk(KERN_ERR "sk98lin: Cannot enable PCI device %s during 
> > resume\n", 
> > +                           dev->name);
> > +           unregister_netdev(dev);
> This looks rather wrong - skge_exit() will run unregister_netdev() again.

You are of course right (the problem was also spotted by Russell King). 
This I believe is the correct one for the sk98lin case.

[PATCH] fix sk98lin driver, ignoring return value from pci_enable_device()

add check of return value to _resume() function of sk98lin driver.

Signed-off-by: Jiri Kosina <[EMAIL PROTECTED]>

---

 drivers/net/sk98lin/skge.c |   20 +++++++++++++++-----
 1 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/drivers/net/sk98lin/skge.c b/drivers/net/sk98lin/skge.c
index d4913c3..3a9323d 100644
--- a/drivers/net/sk98lin/skge.c
+++ b/drivers/net/sk98lin/skge.c
@@ -5070,7 +5070,12 @@ static int skge_resume(struct pci_dev *p
 
        pci_set_power_state(pdev, PCI_D0);
        pci_restore_state(pdev);
-       pci_enable_device(pdev);
+       ret = pci_enable_device(pdev);
+       if (ret) {
+               printk(KERN_WARNING "sk98lin: unable to enable device %s in 
resume\n",
+                               dev->name);
+               goto out_err;
+       }       
        pci_set_master(pdev);
        if (pAC->GIni.GIMacsFound == 2)
                ret = request_irq(dev->irq, SkGeIsr, IRQF_SHARED, "sk98lin", 
dev);
@@ -5078,10 +5083,8 @@ static int skge_resume(struct pci_dev *p
                ret = request_irq(dev->irq, SkGeIsrOnePort, IRQF_SHARED, 
"sk98lin", dev);
        if (ret) {
                printk(KERN_WARNING "sk98lin: unable to acquire IRQ %d\n", 
dev->irq);
-               pAC->AllocFlag &= ~SK_ALLOC_IRQ;
-               dev->irq = 0;
-               pci_disable_device(pdev);
-               return -EBUSY;
+               ret = -EBUSY;
+               goto out_err;
        }
 
        netif_device_attach(dev);
@@ -5098,6 +5101,13 @@ static int skge_resume(struct pci_dev *p
        }
 
        return 0;
+out_err:
+       pAC->AllocFlag &= ~SK_ALLOC_IRQ;
+       dev->irq = 0;
+       pci_disable_device(pdev);
+
+       return ret;
+
 }
 #else
 #define skge_suspend NULL

-- 
Jiri Kosina
-
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html