Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc
* '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"
+6
-4
+5
-4
drivers/mmc/core/host.c
+5
-4
drivers/mmc/core/host.c
···
94
94
spin_unlock_irqrestore(&host->clk_lock, flags);
95
95
return;
96
96
}
97
-
mmc_claim_host(host);
97
+
mutex_lock(&host->clk_gate_mutex);
98
98
spin_lock_irqsave(&host->clk_lock, flags);
99
99
if (!host->clk_requests) {
100
100
spin_unlock_irqrestore(&host->clk_lock, flags);
···
104
104
pr_debug("%s: gated MCI clock\n", mmc_hostname(host));
105
105
}
106
106
spin_unlock_irqrestore(&host->clk_lock, flags);
107
-
mmc_release_host(host);
107
+
mutex_unlock(&host->clk_gate_mutex);
108
108
}
109
109
110
110
/*
···
130
130
{
131
131
unsigned long flags;
132
132
133
-
mmc_claim_host(host);
133
+
mutex_lock(&host->clk_gate_mutex);
134
134
spin_lock_irqsave(&host->clk_lock, flags);
135
135
if (host->clk_gated) {
136
136
spin_unlock_irqrestore(&host->clk_lock, flags);
···
140
140
}
141
141
host->clk_requests++;
142
142
spin_unlock_irqrestore(&host->clk_lock, flags);
143
-
mmc_release_host(host);
143
+
mutex_unlock(&host->clk_gate_mutex);
144
144
}
145
145
146
146
/**
···
215
215
host->clk_gated = false;
216
216
INIT_WORK(&host->clk_gate_work, mmc_host_clk_gate_work);
217
217
spin_lock_init(&host->clk_lock);
218
+
mutex_init(&host->clk_gate_mutex);
218
219
}
219
220
220
221
/**
+1
include/linux/mmc/host.h
+1
include/linux/mmc/host.h
···
183
183
struct work_struct clk_gate_work; /* delayed clock gate */
184
184
unsigned int clk_old; /* old clock value cache */
185
185
spinlock_t clk_lock; /* lock for clk fields */
186
+
struct mutex clk_gate_mutex; /* mutex for clock gating */
186
187
#endif
187
188
188
189
/* host specific block data */