The patch titled
3c59x: check return of pci_enable_device()
has been removed from the -mm tree. Its filename was
3c59x-check-return-of-pci_enable_device.patch
This patch was dropped because an updated version will be merged
------------------------------------------------------
Subject: 3c59x: check return of pci_enable_device()
From: Mark Hindley <mark@xxxxxxxxxxxxxx>
Check return of pci_enable_device in vortex_up().
Signed-off-by: Mark Hindley <mark@xxxxxxxxxxxxxx>
Acked-by: Steffen Klassert <klassert@xxxxxxxxxxxxxxxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
drivers/net/3c59x.c | 8 ++++++--
1 files changed, 6 insertions(+), 2 deletions(-)
diff -puN drivers/net/3c59x.c~3c59x-check-return-of-pci_enable_device drivers/net/3c59x.c
--- a/drivers/net/3c59x.c~3c59x-check-return-of-pci_enable_device
+++ a/drivers/net/3c59x.c
@@ -1490,13 +1490,17 @@ vortex_up(struct net_device *dev)
struct vortex_private *vp = netdev_priv(dev);
void __iomem *ioaddr = vp->ioaddr;
unsigned int config;
- int i, mii_reg1, mii_reg5;
+ int i, mii_reg1, mii_reg5, err;
if (VORTEX_PCI(vp)) {
pci_set_power_state(VORTEX_PCI(vp), PCI_D0); /* Go active */
if (vp->pm_state_valid)
pci_restore_state(VORTEX_PCI(vp));
- pci_enable_device(VORTEX_PCI(vp));
+ err = pci_enable_device(VORTEX_PCI(vp));
+ if (err) {
+ printk(KERN_WARNING "%s: Could not enable device \n",
+ dev->name);
+ }
}
/* Before initializing select the active media port. */
_
Patches currently in -mm which might be from mark@xxxxxxxxxxxxxx are
3c59x-check-return-of-pci_enable_device.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
