The patch titled
drivers/{mmc,misc}: handle PCI errors on resume
has been added to the -mm tree. Its filename is
drivers-mmcmisc-handle-pci-errors-on-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: drivers/{mmc,misc}: handle PCI errors on resume
From: Jeff Garzik <jeff@xxxxxxxxxx>
Since pci_enable_device() is one of the first things called in the resume
step, take the minimalist approach and return immediately, if
pci_enable_device() fails during resume.
Also, in sdhci: don't check for impossible condition (chip==NULL)
Signed-off-by: Jeff Garzik <jeff@xxxxxxxxxx>
Cc: Alex Dubov <oakad@xxxxxxxxx>
Cc: Pierre Ossman <drzeus@xxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
drivers/misc/tifm_7xx1.c | 7 ++++++-
drivers/mmc/sdhci.c | 11 +++++------
2 files changed, 11 insertions(+), 7 deletions(-)
diff -puN drivers/misc/tifm_7xx1.c~drivers-mmcmisc-handle-pci-errors-on-resume drivers/misc/tifm_7xx1.c
--- a/drivers/misc/tifm_7xx1.c~drivers-mmcmisc-handle-pci-errors-on-resume
+++ a/drivers/misc/tifm_7xx1.c
@@ -273,9 +273,14 @@ static int tifm_7xx1_resume(struct pci_d
{
struct tifm_adapter *fm = pci_get_drvdata(dev);
unsigned long flags;
+ int rc;
pci_restore_state(dev);
- pci_enable_device(dev);
+
+ rc = pci_enable_device(dev);
+ if (rc)
+ return rc;
+
pci_set_power_state(dev, PCI_D0);
pci_set_master(dev);
diff -puN drivers/mmc/sdhci.c~drivers-mmcmisc-handle-pci-errors-on-resume drivers/mmc/sdhci.c
--- a/drivers/mmc/sdhci.c~drivers-mmcmisc-handle-pci-errors-on-resume
+++ a/drivers/mmc/sdhci.c
@@ -1090,18 +1090,17 @@ static int sdhci_suspend (struct pci_dev
static int sdhci_resume (struct pci_dev *pdev)
{
- struct sdhci_chip *chip;
+ struct sdhci_chip *chip = pci_get_drvdata(pdev);
int i, ret;
- chip = pci_get_drvdata(pdev);
- if (!chip)
- return 0;
-
DBG("Resuming...\n");
pci_set_power_state(pdev, PCI_D0);
pci_restore_state(pdev);
- pci_enable_device(pdev);
+
+ ret = pci_enable_device(pdev);
+ if (ret)
+ return ret;
for (i = 0;i < chip->num_slots;i++) {
if (!chip->hosts[i])
_
Patches currently in -mm which might be from jeff@xxxxxxxxxx are
origin.patch
tpm-fix-error-handling.patch
x86-microcode-handle-sysfs-error.patch
firmware-dell_rbu-handle-sysfs-errors.patch
ipmi-handle-sysfs-errors.patch
eisa-handle-sysfs-errors.patch
firmware-efivars-handle-error.patch
drivers-mca-handle-sysfs-errors.patch
isdn-several-minor-fixes.patch
fix-up-a-multitude-of-acpi-compiler-warnings-on-x86_64.patch
cpufreq-handle-sysfs-errors.patch
drm-fix-error-returns-sysfs-error-handling.patch
git-dvb.patch
drivers-media-video-handle-sysfs-errors.patch
i2c-buses-scx200_acb-handle-pci-errors.patch
input-handle-sysfs-errors.patch
input-drivers-handle-sysfs-errors.patch
git-libata-all.patch
ata-must-depend-on-block.patch
pci_module_init-conversion-for-pata_pdc2027x.patch
libata-return-sense-data-in-hdio_drive_cmd-ioctl.patch
via-pata-controller-xfer-fixes.patch
ahci-ati-sb600-sata-support-for-various-modes.patch
drivers-mmcmisc-handle-pci-errors-on-resume.patch
git-mtd.patch
git-netdev-all.patch
libphy-dont-do-that.patch
update-smc91x-driver-with-arm-versatile-board-info.patch
b44-fix-eeprom-endianess-issue.patch
forcedeth-power-management-support.patch
remove-unnecessary-check-in-drivers-net-depcac.patch
8139too-force-media-setting-fix.patch
ibmveth-irq-fix.patch
ehea-firmware-interface-based-on-anton-blanchards-new-hvcall-interface.patch
tulip-fix-shutdown-dma-irq-race.patch
drivers-dma-handle-sysfs-errors.patch
atm-firestream-handle-thrown-error.patch
wan-pc300-handle-propagate-minor-errors.patch
r8169-driver-corega-support-patch.patch
git-pciseg.patch
scsi-minor-bug-fixes-and-cleanups.patch
mpt-fusion-handle-pci-layer-error-on-resume.patch
watchdog-itco_wdt-fix-bug-related-to-gcc-uninit-warning.patch
airo-suspend-fix.patch
drivers-led-handle-sysfs-errors.patch
i2o-handle-a-few-sysfs-errors.patch
fs-partitions-check-add-sysfs-error-handling.patch
rtc-fix-printk-of-64-bit-res-on-32-bit-platform.patch
i2o-more-error-checking.patch
isdn-fix-drivers-by-handling-errors-thrown-by-readstat.patch
isdn-check-for-userspace-copy-faults.patch
atyfb-rivafb-minor-fixes.patch
md-conditionalize-some-code.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
