diff options
| author |   Marek Szyprowski <m.szyprowski@samsung.com> | 2010-09-20 15:03:42 +0200 |
|---|---|---|
| committer |   Chris Ball <cjb@laptop.org> | 2010-09-26 16:27:02 -0400 |
| commit | 06fe577f841f383b2d4f743cfb74fac7f6468353 (patch) | |
| tree | 8e2a54b3e99e2eb30617f7d5803038d66c89aa2e /drivers/mmc/host/sdhci-s3c.c | |
| parent | mmc: MAINTAINERS: add myself as MMC maintainer (diff) | |
| download | linux-dev-06fe577f841f383b2d4f743cfb74fac7f6468353.tar.xz linux-dev-06fe577f841f383b2d4f743cfb74fac7f6468353.zip | |
mmc: sdhci-s3c: fix incorrect spinlock usage after merge
In the commit f522886e202a34a2191dd5d471b3c4d46410a9a0 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: Marek Szyprowski <m.szyprowski@samsung.com>
Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Chris Ball <cjb@laptop.org>
Diffstat (limited to '')
| -rw-r--r-- | drivers/mmc/host/sdhci-s3c.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/mmc/host/sdhci-s3c.c b/drivers/mmc/host/sdhci-s3c.c index 71ad4163b95e..735d431f09e6 100644 --- a/drivers/mmc/host/sdhci-s3c.c +++ b/drivers/mmc/host/sdhci-s3c.c @@ -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); } } |