mirror of
https://github.com/followmsi/android_kernel_google_msm.git
synced 2024-11-06 23:17:41 +00:00
[ARM] 5322/1: Fix fastpath issue in mmci.c
Fix fastpath issues Since mmci_request() can be called from a non-interrupt context, and does, during kernel init, causing a host of debug messages during boot if you enable spinlock debugging, we need to use the spinlock calls that save IRQ flags and restore them. Signed-off-by: Linus Walleij <triad@df.lth.se> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
This commit is contained in:
parent
f8d56f1771
commit
9e9430213f
1 changed files with 3 additions and 2 deletions
|
@ -391,6 +391,7 @@ static irqreturn_t mmci_irq(int irq, void *dev_id)
|
||||||
static void mmci_request(struct mmc_host *mmc, struct mmc_request *mrq)
|
static void mmci_request(struct mmc_host *mmc, struct mmc_request *mrq)
|
||||||
{
|
{
|
||||||
struct mmci_host *host = mmc_priv(mmc);
|
struct mmci_host *host = mmc_priv(mmc);
|
||||||
|
unsigned long flags;
|
||||||
|
|
||||||
WARN_ON(host->mrq != NULL);
|
WARN_ON(host->mrq != NULL);
|
||||||
|
|
||||||
|
@ -402,7 +403,7 @@ static void mmci_request(struct mmc_host *mmc, struct mmc_request *mrq)
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
spin_lock_irq(&host->lock);
|
spin_lock_irqsave(&host->lock, flags);
|
||||||
|
|
||||||
host->mrq = mrq;
|
host->mrq = mrq;
|
||||||
|
|
||||||
|
@ -411,7 +412,7 @@ static void mmci_request(struct mmc_host *mmc, struct mmc_request *mrq)
|
||||||
|
|
||||||
mmci_start_command(host, mrq->cmd, 0);
|
mmci_start_command(host, mrq->cmd, 0);
|
||||||
|
|
||||||
spin_unlock_irq(&host->lock);
|
spin_unlock_irqrestore(&host->lock, flags);
|
||||||
}
|
}
|
||||||
|
|
||||||
static void mmci_set_ios(struct mmc_host *mmc, struct mmc_ios *ios)
|
static void mmci_set_ios(struct mmc_host *mmc, struct mmc_ios *ios)
|
||||||
|
|
Loading…
Reference in a new issue