Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9e943021 authored by Linus Walleij's avatar Linus Walleij Committed by Russell King
Browse files

[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: default avatarLinus Walleij <triad@df.lth.se>
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent f8d56f17

drivers/mmc/host/mmci.c

+3 −2
Original line number Original line Diff line number Diff line
@@ -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)