From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 14 Jan 2012 04:41:15 +0000 (-0800)
Subject: Merge tag 'mmc-merge-for-3.3-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Tag: v3.3-rc1~72
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=4b8be38cf782f8ebebc089083fa0572ade79d7ca;p=profile%2Fivi%2Fkernel-x86-ivi.git

Merge tag 'mmc-merge-for-3.3-rc1' of git://git./linux/kernel/git/cjb/mmc

MMC highlights for 3.3:

Core:
 * Support for the HS200 high-speed eMMC mode.
 * Support SDIO 3.0 Ultra High Speed cards.
 * Kill pending block requests immediately if card is removed.
 * Enable the eMMC feature for locking boot partitions read-only
   until next power on, exposed via sysfs.

Drivers:
 * Runtime PM support for Intel Medfield SDIO.
 * Suspend/resume support for sdhci-spear.
 * sh-mmcif now processes requests asynchronously.

* tag 'mmc-merge-for-3.3-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc: (58 commits)
  mmc: fix a deadlock between system suspend and MMC block IO
  mmc: sdhci: restore the enabled dma when do reset all
  mmc: dw_mmc: miscaculated the fifo-depth with wrong bit operation
  mmc: host: Adds support for eMMC 4.5 HS200 mode
  mmc: core: HS200 mode support for eMMC 4.5
  mmc: dw_mmc: fixed wrong bit operation for SDMMC_GET_FCNT()
  mmc: core: Separate the timeout value for cache-ctrl
  mmc: sdhci-spear: Fix compilation error
  mmc: sdhci: Deal with failure case in sdhci_suspend_host
  mmc: dw_mmc: Clear the DDR mode for non-DDR
  mmc: sd: Fix SDR12 timing regression
  mmc: sdhci: Fix tuning timer incorrect setting when suspending host
  mmc: core: Add option to prevent eMMC sleep command
  mmc: omap_hsmmc: use threaded irq handler for card-detect.
  mmc: sdhci-pci: enable runtime PM for Medfield SDIO
  mmc: sdhci: Always pass clock request value zero to set_clock host op
  mmc: sdhci-pci: remove SDHCI_QUIRK2_OWN_CARD_DETECTION
  mmc: sdhci-pci: get gpio numbers from platform data
  mmc: sdhci-pci: add platform data
  mmc: sdhci: prevent card detection activity for non-removable cards
  ...
---

4b8be38cf782f8ebebc089083fa0572ade79d7ca
diff --cc drivers/mmc/host/omap_hsmmc.c
index d1fb561,09fc4f8..fd0c661
--- a/drivers/mmc/host/omap_hsmmc.c
+++ b/drivers/mmc/host/omap_hsmmc.c
@@@ -2178,10 -2158,15 +2160,9 @@@ static int omap_hsmmc_suspend(struct de
  				return ret;
  			}
  		}
- 		cancel_work_sync(&host->mmc_carddetect_work);
  		ret = mmc_suspend_host(host->mmc);
  
 -		if (ret == 0) {
 -			omap_hsmmc_disable_irq(host);
 -			OMAP_HSMMC_WRITE(host->base, HCTL,
 -				OMAP_HSMMC_READ(host->base, HCTL) & ~SDBP);
 -			if (host->got_dbclk)
 -				clk_disable(host->dbclk);
 -		} else {
 +		if (ret) {
  			host->suspended = 0;
  			if (host->pdata->resume) {
  				ret = host->pdata->resume(&pdev->dev,