On Fri, May 06, 2011 at 09:37:46AM +0300, Ohad Ben-Cohen wrote: > On Fri, May 6, 2011 at 12:54 AM, <gregkh@xxxxxxx> wrote: > > > > This is a note to let you know that I've just added the patch titled > > > > mmc: fix all hangs related to mmc/sd card insert/removal during suspend/resume > > > > to the 2.6.32-longterm tree > > That patch introduced a suspend/resume regression, so please also add > the one that fixed it: > > commit 1c8cf9c997a4a6b36e907c7ede5f048aeaab1644 > Author: Ohad Ben-Cohen <ohad@xxxxxxxxxx> > Date: Wed Oct 13 09:31:56 2010 +0200 > > mmc: sdio: fix SDIO suspend/resume regression > > Fix SDIO suspend/resume regression introduced by 4c2ef25fe0b "mmc: fix > all hangs related to mmc/sd card insert/removal during suspend/resume": > > PM: Syncing filesystems ... done. > Freezing user space processes ... (elapsed 0.01 seconds) done. > Freezing remaining freezable tasks ... (elapsed 0.01 seconds) done. > Suspending console(s) (use no_console_suspend to debug) > pm_op(): platform_pm_suspend+0x0/0x5c returns -38 > PM: Device pxa2xx-mci.0 failed to suspend: error -38 > PM: Some devices failed to suspend > > 4c2ef25fe0b moved the card removal/insertion mechanism out of MMC's > suspend/resume path and into pm notifiers (mmc_pm_notify), and that > broke SDIO's expectation that mmc_suspend_host() will remove the card, > and squash the error, in case -ENOSYS is returned from the bus suspend > handler (mmc_sdio_suspend() in this case). > > mmc_sdio_suspend() is using this whenever at least one of the card's SDIO > function drivers does not have suspend/resume handlers - in that case > it is agreed to force removal of the entire card. > > This patch fixes this regression by trivially bringing back that part of > mmc_suspend_host(), which was removed by 4c2ef25fe0b. > > Reported-and-tested-by: Sven Neumann <s.neumann@xxxxxxxxxxxx> > Signed-off-by: Ohad Ben-Cohen <ohad@xxxxxxxxxx> > Cc: Maxim Levitsky <maximlevitsky@xxxxxxxxx> > Cc: <stable@xxxxxxxxxx> > Acked-by: Nicolas Pitre <nico@xxxxxxxxxxx> > Signed-off-by: Chris Ball <cjb@xxxxxxxxxx> Now queued up, thanks. greg k-h -- To unsubscribe from this list: send the line "unsubscribe linux-mmc" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
