The patch titled
Check pci_enable_device() return value in myri10ge_resume()
has been added to the -mm tree. Its filename is
check-pci_enable_device-return-value-in-myri10ge_resume.patch
See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find
out what to do about this
------------------------------------------------------
Subject: Check pci_enable_device() return value in myri10ge_resume()
From: Brice Goglin <brice@xxxxxxxx>
Check pci_enable_device() return value in myri10ge_resume().
Signed-off-by: Brice Goglin <brice@xxxxxxxx>
Cc: Jeff Garzik <jeff@xxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
drivers/net/myri10ge/myri10ge.c | 13 ++++++++++---
1 file changed, 10 insertions(+), 3 deletions(-)
diff -puN drivers/net/myri10ge/myri10ge.c~check-pci_enable_device-return-value-in-myri10ge_resume drivers/net/myri10ge/myri10ge.c
--- a/drivers/net/myri10ge/myri10ge.c~check-pci_enable_device-return-value-in-myri10ge_resume
+++ a/drivers/net/myri10ge/myri10ge.c
@@ -2412,14 +2412,20 @@ static int myri10ge_resume(struct pci_de
return -EIO;
}
myri10ge_restore_state(mgp);
- pci_enable_device(pdev);
+
+ status = pci_enable_device(pdev);
+ if (status < 0) {
+ dev_err(&pdev->dev, "failed to enable device\n");
+ return -EIO;
+ }
+
pci_set_master(pdev);
status = request_irq(pdev->irq, myri10ge_intr, IRQF_SHARED,
netdev->name, mgp);
if (status != 0) {
dev_err(&pdev->dev, "failed to allocate IRQ\n");
- goto abort_with_msi;
+ goto abort_with_enabled;
}
myri10ge_reset(mgp);
@@ -2438,7 +2444,8 @@ static int myri10ge_resume(struct pci_de
return 0;
-abort_with_msi:
+abort_with_enabled:
+ pci_disable_device(pdev);
return -EIO;
}
_
Patches currently in -mm which might be from brice@xxxxxxxx are
check-pci_enable_device-return-value-in-myri10ge_resume.patch
x86_64-fix-bus-numbering-format-in-mmconfig-warning.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
