Skip to content

Commit

Permalink
mmc: use lock instead of claim in debug check
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Pierre Ossman committed May 8, 2007
1 parent 790864d commit 1efd48b
Showing 1 changed file with 6 additions and 4 deletions.
10 changes: 6 additions & 4 deletions drivers/mmc/core/core.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down Expand Up @@ -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();
Expand Down

0 comments on commit 1efd48b

Please sign in to comment.