diff options
| author | Haitao Zhang <minipanda@linuxrobot.org> | 2011-10-21 13:23:16 +0800 |
|---|---|---|
| committer | Eric Miao <eric.miao@linaro.org> | 2011-12-02 14:41:05 +0800 |
| commit | 306c2728eeae085f1b87a162a19136e9f1c5f006 (patch) | |
| tree | 1daefe22ca1c874a809c94a069a340075ec375be | |
| parent | 87bd202e687a9a733c8edb716b6875c7f48384cb (diff) | |
SAUCE: mx53_loco: fix deadlock report from sdma_tx_submit() during boot
BugLink: http://bugs.launchpad.net/bugs/878701
Adjust to use spin_lock_irqsave()/spin_lock_irqresotre(), so to
make it safe when called from interrupt context.
Signed-off-by: Haitao Zhang <haitao.zhang@linaro.org>
Signed-off-by: Eric Miao <eric.miao@linaro.org>
| -rw-r--r-- | drivers/dma/imx-sdma.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/dma/imx-sdma.c b/drivers/dma/imx-sdma.c index 77f92d1f624..c3d135afe66 100644 --- a/drivers/dma/imx-sdma.c +++ b/drivers/dma/imx-sdma.c @@ -832,17 +832,18 @@ static struct sdma_channel *to_sdma_chan(struct dma_chan *chan) static dma_cookie_t sdma_tx_submit(struct dma_async_tx_descriptor *tx) { + unsigned long flags; struct sdma_channel *sdmac = to_sdma_chan(tx->chan); struct sdma_engine *sdma = sdmac->sdma; dma_cookie_t cookie; - spin_lock_irq(&sdmac->lock); + spin_lock_irqsave(&sdmac->lock, flags); cookie = sdma_assign_cookie(sdmac); sdma_enable_channel(sdma, sdmac->channel); - spin_unlock_irq(&sdmac->lock); + spin_unlock_irqrestore(&sdmac->lock, flags); return cookie; } |