Re: [PATCH] PC300 pci_enable_device fix

[Marcelo Tosatti <marcelo.tosatti@cyclades.com>]

Germano, can you give this patch a try before merging, please.

On Wed, Apr 13, 2005 at 04:45:31PM -0300, Marcelo Tosatti wrote:
> On Wed, Apr 13, 2005 at 03:02:43PM -0700, Ashok Raj wrote:
> > On Wed, Apr 13, 2005 at 02:31:43PM -0700, Bjorn Helgaas wrote:
> > > 
> > >    Call pci_enable_device() before looking at IRQ and resources.
> > >    The driver requires this fix or the "pci=routeirq" workaround
> > >    on 2.6.10 and later kernels.
> > 
> > 
> > the failure cases dont seem to worry about pci_disable_device()?
> > 
> > in err_release_ram: etc?
> 
> Yep the failure paths were wrong before, but Bjorn's patch moves 
> pci_enable_device() way up to the beginning of the function. 
> 
> The failure path's err_release_ram etc. wont touch the resources
> without pci_enable_pci(), with the fix.

Hi, 

I see what you mean now, Ashok. Yes, you are right, the error path lacks
pci_disable_device().

Reported by Artur Lipowski.

Signed-off-by: Bjorn Helgaas <bjorn.helgaas@hp.com>
Signed-off-by: Marcelo Tosatti <marcelo.tosatti@cyclades.com>

--- a/drivers/net/wan/pc300_drv.c.orig	2005-04-14 13:56:04.000000000 -0300
+++ b/drivers/net/wan/pc300_drv.c	2005-04-14 13:58:56.000000000 -0300
@@ -3439,11 +3439,15 @@
 #endif
 	}
 
+	if ((err = pci_enable_device(pdev)) != 0)
+		return err;
+
 	card = (pc300_t *) kmalloc(sizeof(pc300_t), GFP_KERNEL);
 	if (card == NULL) {
 		printk("PC300 found at RAM 0x%08lx, "
 		       "but could not allocate card structure.\n",
 		       pci_resource_start(pdev, 3));
+		pci_disable_device(pdev);
 		return -ENOMEM;
 	}
 	memset(card, 0, sizeof(pc300_t));
@@ -3527,8 +3531,6 @@
 		goto err_release_ram;
 	}
 
-	if ((err = pci_enable_device(pdev)) != 0)
-		goto err_release_sca;
 
 	card->hw.plxbase = ioremap(card->hw.plxphys, card->hw.plxsize);
 	card->hw.rambase = ioremap(card->hw.ramphys, card->hw.alloc_ramsize);
@@ -3628,6 +3630,7 @@
 err_release_io:
 	release_region(card->hw.iophys, card->hw.iosize);
 	kfree(card);
+	pci_disable_device(pdev);
 	return -ENODEV;
 }
 
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/