diff options
author | Ulf Hansson <ulf.hansson@stericsson.com> | 2011-12-13 10:53:17 -0500 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2012-01-19 19:00:55 -0500 |
commit | 5074d25dc97ac2d93fca7852563b7e204f03464a (patch) | |
tree | 149c4fc742e4bc1db63dc6941028d27b10b88ced | |
parent | 859dd55d91d977090efbba15c7dfc82e7ed774ef (diff) |
ARM: 7216/1: mmc: mmci: Do not release spinlock in request_end
The patch "mmc: core: move ->request() call from atomic context",
is the reason to why this change is possible. This simplifies the
error handling code execution path quite a lot and potentially also
fixes some error handling hang problems.
Tested-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Ulf Hansson <ulf.hansson@stericsson.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
-rw-r--r-- | drivers/mmc/host/mmci.c | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/drivers/mmc/host/mmci.c b/drivers/mmc/host/mmci.c index 0d955ffaf44e..0e04138b1759 100644 --- a/drivers/mmc/host/mmci.c +++ b/drivers/mmc/host/mmci.c | |||
@@ -166,14 +166,8 @@ mmci_request_end(struct mmci_host *host, struct mmc_request *mrq) | |||
166 | host->mrq = NULL; | 166 | host->mrq = NULL; |
167 | host->cmd = NULL; | 167 | host->cmd = NULL; |
168 | 168 | ||
169 | /* | ||
170 | * Need to drop the host lock here; mmc_request_done may call | ||
171 | * back into the driver... | ||
172 | */ | ||
173 | spin_unlock(&host->lock); | ||
174 | pm_runtime_put(mmc_dev(host->mmc)); | 169 | pm_runtime_put(mmc_dev(host->mmc)); |
175 | mmc_request_done(host->mmc, mrq); | 170 | mmc_request_done(host->mmc, mrq); |
176 | spin_lock(&host->lock); | ||
177 | } | 171 | } |
178 | 172 | ||
179 | static void mmci_set_mask1(struct mmci_host *host, unsigned int mask) | 173 | static void mmci_set_mask1(struct mmci_host *host, unsigned int mask) |