tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

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>

authored by

Kyungmin Park and committed by
Linus Torvalds f522886e 51932501

+3 -3
+3 -3
drivers/mmc/host/sdhci-s3c.c
··· 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 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