The patch titled
drivers/{mmc,misc}: handle PCI errors on resume
has been removed from the -mm tree. Its filename was
drivers-mmcmisc-handle-pci-errors-on-resume.patch
This patch was dropped because it was nacked by the maintainer
------------------------------------------------------
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
ibmveth-fix-index-increment-calculation.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
input-handle-sysfs-errors.patch
input-drivers-handle-sysfs-errors.patch
git-libata-all.patch
ata-must-depend-on-block.patch
ahci-readability-tweak.patch
libata-sff-allow-for-wacky-systems.patch
libata-revamp-blacklist-support-to-allow-multiple-kinds.patch
pata_marvell-marvell-6101-6145-pata-driver.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
8139too-force-media-setting-fix.patch
tulip-fix-shutdown-dma-irq-race.patch
atm-firestream-handle-thrown-error.patch
wan-pc300-handle-propagate-minor-errors.patch
net-atm-handle-sysfs-errors.patch
git-ioat.patch
pcmcia-handle-sysfs-pci-errors.patch
r8169-driver-corega-support-patch.patch
serial-handle-pci_enable_device-failure-upon-resume.patch
git-pciseg.patch
scsi-minor-bug-fixes-and-cleanups.patch
mpt-fusion-handle-pci-layer-error-on-resume.patch
scsi-aha1740-handle-scsi-api-errors.patch
scsi-qla2xxx-handle-sysfs-errors.patch
git-watchdog.patch
git-wireless.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
atyfb-rivafb-minor-fixes.patch
md-conditionalize-some-code.patch
user-of-the-jiffies-rounding-patch-ata-subsystem.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
