The patch titled
serial: handle pci_enable_device() failure upon resume
has been removed from the -mm tree. Its filename was
serial-handle-pci_enable_device-failure-upon-resume.patch
This patch was dropped because Russell Nacked it, but I forget why
------------------------------------------------------
Subject: serial: handle pci_enable_device() failure upon resume
From: Jeff Garzik <jeff@xxxxxxxxxx>
Signed-off-by: Jeff Garzik <jeff@xxxxxxxxxx>
Cc: Russell King <rmk@xxxxxxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
drivers/serial/8250_pci.c | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff -puN drivers/serial/8250_pci.c~serial-handle-pci_enable_device-failure-upon-resume drivers/serial/8250_pci.c
--- a/drivers/serial/8250_pci.c~serial-handle-pci_enable_device-failure-upon-resume
+++ a/drivers/serial/8250_pci.c
@@ -1817,16 +1817,20 @@ static int pciserial_resume_one(struct p
pci_restore_state(dev);
if (priv) {
+ int rc;
+
/*
* The device may have been disabled. Re-enable it.
*/
- pci_enable_device(dev);
+ rc = pci_enable_device(dev);
+ if (rc)
+ return rc;
pciserial_resume_ports(priv);
}
return 0;
}
-#endif
+#endif /* CONFIG_PM */
static struct pci_device_id serial_pci_tbl[] = {
{ PCI_VENDOR_ID_V3, PCI_DEVICE_ID_V3_V960,
_
Patches currently in -mm which might be from jeff@xxxxxxxxxx are
origin.patch
git-acpi.patch
git-cpufreq.patch
drm-handle-pci_enable_device-failure.patch
git-input.patch
git-libata-all.patch
pata_cs5530-suspend-resume-support-tweak.patch
pata_sil680-suspend-resume-tidy.patch
initializer-entry-defined-twice-in-pata_rz1000.patch
ata_piix-ide-mode-sata-patch-for-intel-ich9.patch
pata_it8213-add-new-driver-for-the-it8213-card.patch
pata_it8213-add-new-driver-for-the-it8213-card-tidy.patch
via-pata-controller-xfer-fixes.patch
via-pata-controller-xfer-fixes-fix.patch
ahci-ati-sb600-sata-support-for-various-modes.patch
git-mtd.patch
libphy-dont-do-that.patch
update-smc91x-driver-with-arm-versatile-board-info.patch
8139too-force-media-setting-fix.patch
bonding-incorrect-bonding-state-reported-via-ioctl.patch
declance-fix-pmax-and-pmad-support.patch
declance-support-the-i-o-asic-lance-w-o-turbochannel.patch
tulip-fix-shutdown-dma-irq-race.patch
add-cppflags-to-byteorderh-check.patch
git-ioat.patch
serial-handle-pci_enable_device-failure-upon-resume.patch
git-pciseg.patch
pci-device-ensure-sysdata-initialised-v2.patch
git-scsi-misc.patch
mpt-fusion-handle-pci-layer-error-on-resume.patch
scsi-megaraid-fix-mmio-casts.patch
usb-fix-ohcih-over-use-warnings.patch
i2o-more-error-checking.patch
pnp-handle-sysfs-errors.patch
rtc-handle-sysfs-errors.patch
sound-oss-emu10k1-handle-userspace-copy-errors.patch
spi-improve-sysfs-compiler-complaint-handling.patch
remove-double-cast-to-same-type.patch
via82cxxx-handle-error-condition-properly.patch
isdn-fix-warnings.patch
atyfb-rivafb-minor-fixes.patch
md-conditionalize-some-code.patch
user-of-the-jiffies-rounding-patch-ata-subsystem.patch
e1000-printk-warning-fixes.patch
git-gccbug.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
