evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc

Browse source 
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc:
  Revert "mmc: fix a race between card-detect rescan and clock-gate work instances"
This commit is contained in:
Linus Torvalds 2011-05-16 18:36:47 -07:00
commit 477de0de44
2 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
drivers/mmc/core/host.c
View file

@ -94,7 +94,7 @@ static void mmc_host_clk_gate_delayed(struct mmc_host *host)
spin_unlock_irqrestore(&host->clk_lock, flags); spin_unlock_irqrestore(&host->clk_lock, flags);
return; return;
} }
mmc_claim_host(host); mutex_lock(&host->clk_gate_mutex);
spin_lock_irqsave(&host->clk_lock, flags); spin_lock_irqsave(&host->clk_lock, flags);
if (!host->clk_requests) { if (!host->clk_requests) {
spin_unlock_irqrestore(&host->clk_lock, flags); spin_unlock_irqrestore(&host->clk_lock, flags);
@ -104,7 +104,7 @@ static void mmc_host_clk_gate_delayed(struct mmc_host *host)
pr_debug("%s: gated MCI clock\n", mmc_hostname(host)); pr_debug("%s: gated MCI clock\n", mmc_hostname(host));
} }
spin_unlock_irqrestore(&host->clk_lock, flags); spin_unlock_irqrestore(&host->clk_lock, flags);
mmc_release_host(host); mutex_unlock(&host->clk_gate_mutex);
} }
/* /*
@ -130,7 +130,7 @@ void mmc_host_clk_ungate(struct mmc_host *host)
{ {
unsigned long flags; unsigned long flags;
mmc_claim_host(host); mutex_lock(&host->clk_gate_mutex);
spin_lock_irqsave(&host->clk_lock, flags); spin_lock_irqsave(&host->clk_lock, flags);
if (host->clk_gated) { if (host->clk_gated) {
spin_unlock_irqrestore(&host->clk_lock, flags); spin_unlock_irqrestore(&host->clk_lock, flags);
@ -140,7 +140,7 @@ void mmc_host_clk_ungate(struct mmc_host *host)
} }
host->clk_requests++; host->clk_requests++;
spin_unlock_irqrestore(&host->clk_lock, flags); spin_unlock_irqrestore(&host->clk_lock, flags);
mmc_release_host(host); mutex_unlock(&host->clk_gate_mutex);
} }
/** /**
@ -215,6 +215,7 @@ static inline void mmc_host_clk_init(struct mmc_host *host)
host->clk_gated = false; host->clk_gated = false;
INIT_WORK(&host->clk_gate_work, mmc_host_clk_gate_work); INIT_WORK(&host->clk_gate_work, mmc_host_clk_gate_work);
spin_lock_init(&host->clk_lock); spin_lock_init(&host->clk_lock);
mutex_init(&host->clk_gate_mutex);
} }
/** /**

1
include/linux/mmc/host.h
View file

@ -183,6 +183,7 @@ struct mmc_host {
struct work_struct clk_gate_work; /* delayed clock gate */ struct work_struct clk_gate_work; /* delayed clock gate */
unsigned int clk_old; /* old clock value cache */ unsigned int clk_old; /* old clock value cache */
spinlock_t clk_lock; /* lock for clk fields */ spinlock_t clk_lock; /* lock for clk fields */
struct mutex clk_gate_mutex; /* mutex for clock gating */
#endif #endif
/* host specific block data */ /* host specific block data */