summaryrefslogtreecommitdiffstats
path: root/drivers/mmc/host/mmci.c
diff options
context:
space:
mode:
authorUlf Hansson2011-12-13 16:53:17 +0100
committerRussell King2012-01-20 01:00:55 +0100
commit5074d25dc97ac2d93fca7852563b7e204f03464a (patch)
tree149c4fc742e4bc1db63dc6941028d27b10b88ced /drivers/mmc/host/mmci.c
parentARM: 7215/1: mmc: mmci: Increase max_segs from 16 to 128 (diff)
downloadkernel-qcow2-linux-5074d25dc97ac2d93fca7852563b7e204f03464a.tar.gz
kernel-qcow2-linux-5074d25dc97ac2d93fca7852563b7e204f03464a.tar.xz
kernel-qcow2-linux-5074d25dc97ac2d93fca7852563b7e204f03464a.zip
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>
Diffstat (limited to 'drivers/mmc/host/mmci.c')
-rw-r--r--drivers/mmc/host/mmci.c6
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)
host->mrq = NULL;
host->cmd = NULL;
- /*
- * Need to drop the host lock here; mmc_request_done may call
- * back into the driver...
- */
- spin_unlock(&host->lock);
pm_runtime_put(mmc_dev(host->mmc));
mmc_request_done(host->mmc, mrq);
- spin_lock(&host->lock);
}
static void mmci_set_mask1(struct mmci_host *host, unsigned int mask)