diff options
| author | Pierre Ossman <drzeus@drzeus.cx> | 2007-05-08 22:35:17 +0200 |
|---|---|---|
| committer | Pierre Ossman <drzeus@drzeus.cx> | 2007-05-08 22:42:57 +0200 |
| commit | 1efd48b3ae8f89a1d04f1e36be96764d7bf43ae9 (patch) | |
| tree | 0d45e47c53d71390519b5890021417e3ec1b2b3b | |
| parent | 790864dcc2b3fe65355dd84ef8481e54b1bc61b6 (diff) | |
mmc: use lock instead of claim in debug check
As mmc_detect_change() can be called from irq context, using
claim (which can sleep) is inherently unsafe. Use the host
spinlock instead, which also is faster.
Signed-off-by: Pierre Ossman <drzeus@drzeus.cx>
| -rw-r--r-- | drivers/mmc/core/core.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/drivers/mmc/core/core.c b/drivers/mmc/core/core.c index 72c7cf4a9f9..b6c16704aaa 100644 --- a/drivers/mmc/core/core.c +++ b/drivers/mmc/core/core.c @@ -500,9 +500,10 @@ void __mmc_release_bus(struct mmc_host *host) void mmc_detect_change(struct mmc_host *host, unsigned long delay) { #ifdef CONFIG_MMC_DEBUG - mmc_claim_host(host); + unsigned long flags; + spin_lock_irqsave(host->lock, flags); BUG_ON(host->removed); - mmc_release_host(host); + spin_unlock_irqrestore(host->lock, flags); #endif mmc_schedule_delayed_work(&host->detect, delay); @@ -625,9 +626,10 @@ EXPORT_SYMBOL(mmc_add_host); void mmc_remove_host(struct mmc_host *host) { #ifdef CONFIG_MMC_DEBUG - mmc_claim_host(host); + unsigned long flags; + spin_lock_irqsave(&host->lock, flags); host->removed = 1; - mmc_release_host(host); + spin_unlock_irqrestore(&host->lock, flags); #endif mmc_flush_scheduled_work(); |