* [PATCH 2.6.9-rc2-mm1 1/1] 3c59x: missing pci_disable_device
@ 2004-09-18 22:01 Francois Romieu
2004-09-20 18:16 ` Jeff Garzik
0 siblings, 1 reply; 4+ messages in thread
From: Francois Romieu @ 2004-09-18 22:01 UTC (permalink / raw)
To: akpm; +Cc: jgarzik, netdev
It is possible to remove the device without calling pci_disable_device().
A leak can take place during the init as well.
Signed-off-by: Francois Romieu <romieu@fr.zoreil.com>
diff -puN drivers/net/3c59x.c~3c59x-00 drivers/net/3c59x.c
--- linux-2.6.9-rc2/drivers/net/3c59x.c~3c59x-00 2004-09-18 22:20:43.000000000 +0200
+++ linux-2.6.9-rc2-fr/drivers/net/3c59x.c 2004-09-18 22:20:43.000000000 +0200
@@ -1075,14 +1075,20 @@ static int __devinit vortex_init_one (st
int rc;
/* wake up and enable device */
- if (pci_enable_device (pdev)) {
- rc = -EIO;
- } else {
- rc = vortex_probe1 (&pdev->dev, pci_resource_start (pdev, 0),
- pdev->irq, ent->driver_data, vortex_cards_found);
- if (rc == 0)
- vortex_cards_found++;
+ rc = pci_enable_device (pdev);
+ if (rc < 0)
+ goto out;
+
+ rc = vortex_probe1 (&pdev->dev, pci_resource_start (pdev, 0),
+ pdev->irq, ent->driver_data, vortex_cards_found);
+ if (rc < 0) {
+ pci_disable_device (pdev);
+ goto out;
}
+
+ vortex_cards_found++;
+
+out:
return rc;
}
@@ -3163,6 +3169,7 @@ static void __devexit vortex_remove_one
pci_set_power_state(VORTEX_PCI(vp), 0); /* Go active */
if (vp->pm_state_valid)
pci_restore_state(VORTEX_PCI(vp), vp->power_state);
+ pci_disable_device(VORTEX_PCI(vp));
}
/* Should really use issue_and_wait() here */
outw(TotalReset|0x14, dev->base_addr + EL3_CMD);
_
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH 2.6.9-rc2-mm1 1/1] 3c59x: missing pci_disable_device
2004-09-18 22:01 [PATCH 2.6.9-rc2-mm1 1/1] 3c59x: missing pci_disable_device Francois Romieu
@ 2004-09-20 18:16 ` Jeff Garzik
2004-09-20 18:35 ` Andrew Morton
0 siblings, 1 reply; 4+ messages in thread
From: Jeff Garzik @ 2004-09-20 18:16 UTC (permalink / raw)
To: akpm; +Cc: Francois Romieu, netdev
Andrew,
Are you picking up this 3c59x patch, or should I stick it into netdev-2.6?
Jeff
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH 2.6.9-rc2-mm1 1/1] 3c59x: missing pci_disable_device
2004-09-20 18:16 ` Jeff Garzik
@ 2004-09-20 18:35 ` Andrew Morton
2004-09-20 18:39 ` Jeff Garzik
0 siblings, 1 reply; 4+ messages in thread
From: Andrew Morton @ 2004-09-20 18:35 UTC (permalink / raw)
To: Jeff Garzik; +Cc: romieu, netdev
Jeff Garzik <jgarzik@pobox.com> wrote:
>
> Are you picking up this 3c59x patch,
I did so.
> or should I stick it into netdev-2.6?
That works, too.
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH 2.6.9-rc2-mm1 1/1] 3c59x: missing pci_disable_device
2004-09-20 18:35 ` Andrew Morton
@ 2004-09-20 18:39 ` Jeff Garzik
0 siblings, 0 replies; 4+ messages in thread
From: Jeff Garzik @ 2004-09-20 18:39 UTC (permalink / raw)
To: Andrew Morton; +Cc: romieu, netdev
Andrew Morton wrote:
> Jeff Garzik <jgarzik@pobox.com> wrote:
>
>>Are you picking up this 3c59x patch,
>
>
> I did so.
Since I am always eager to hand off 3c59x patches, I'll leave it out of
netdev-2.6 then... :)
Jeff
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2004-09-20 18:39 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2004-09-18 22:01 [PATCH 2.6.9-rc2-mm1 1/1] 3c59x: missing pci_disable_device Francois Romieu
2004-09-20 18:16 ` Jeff Garzik
2004-09-20 18:35 ` Andrew Morton
2004-09-20 18:39 ` Jeff Garzik
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).