Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit f522886e202a34a2191dd5d471b3c4d46410a9a0

Authored by Kyungmin Park
Committed by Linus Torvalds
1 parent 5193250168
Exists in master and in 7 other branches imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-l5.0.0_1.0.0-ga

drivers/mmc/host/sdhci-s3c.c: use the correct mutex and card detect function 

There's some merge problem between sdhic core and sdhci-s3c host.  After
mutex is changed to spinlock.  It needs to use use spin lock functions and
use the correct card detection function.

Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
Cc: <linux-mmc@vger.kernel.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

Showing 1 changed file with 3 additions and 3 deletions Side-by-side Diff

drivers/mmc/host/sdhci-s3c.c
Diff comments   View file @ f522886
... ... @@ -242,7 +242,7 @@
242 242 {
243 243 struct sdhci_host *host = platform_get_drvdata(dev);
244 244 if (host) {
245   - mutex_lock(&host->lock);
  245 + spin_lock(&host->lock);
246 246 if (state) {
247 247 dev_dbg(&dev->dev, "card inserted.\n");
248 248 host->flags &= ~SDHCI_DEVICE_DEAD;
... ... @@ -252,8 +252,8 @@
252 252 host->flags |= SDHCI_DEVICE_DEAD;
253 253 host->quirks &= ~SDHCI_QUIRK_BROKEN_CARD_DETECTION;
254 254 }
255   - sdhci_card_detect(host);
256   - mutex_unlock(&host->lock);
  255 + tasklet_schedule(&host->card_tasklet);
  256 + spin_unlock(&host->lock);
257 257 }
258 258 }
259 259