Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 06fe577f authored by Marek Szyprowski's avatar Marek Szyprowski Committed by Chris Ball
Browse files

mmc: sdhci-s3c: fix incorrect spinlock usage after merge 



In the commit f522886e a merge conflict
in the sdhci-s3c driver been fixed. However the fix used incorrect
spinlock operation - it caused a race with sdhci interrupt service. The
correct way to solve it is to use spin_lock_irqsave/irqrestore() calls.

Signed-off-by: default avatarMarek Szyprowski <m.szyprowski@samsung.com>
Signed-off-by: default avatarKyungmin Park <kyungmin.park@samsung.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarChris Ball <cjb@laptop.org>
parent 245feaa6

drivers/mmc/host/sdhci-s3c.c

+4 −2
Original line number Diff line number Diff line
@@ -241,8 +241,10 @@ static struct sdhci_ops sdhci_s3c_ops = { 
static void sdhci_s3c_notify_change(struct platform_device *dev, int state)

{

	struct sdhci_host *host = platform_get_drvdata(dev);

	unsigned long flags;



	if (host) {

		spin_lock(&host->lock);

		spin_lock_irqsave(&host->lock, flags);

		if (state) {

			dev_dbg(&dev->dev, "card inserted.\n");

			host->flags &= ~SDHCI_DEVICE_DEAD;
@@ -253,7 +255,7 @@ static void sdhci_s3c_notify_change(struct platform_device *dev, int state) 
			host->quirks &= ~SDHCI_QUIRK_BROKEN_CARD_DETECTION;

		}

		tasklet_schedule(&host->card_tasklet);

		spin_unlock(&host->lock);

		spin_unlock_irqrestore(&host->lock, flags);

	}

}