diff options
| author | Nicolas Boichat <drinkcat@chromium.org> | 2015-08-17 05:52:54 +0200 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2015-09-17 13:13:40 +0200 |
| commit | c15f6ed3a18f10cdc33f64906ab353f17a6df114 (patch) | |
| tree | d31632b7d325d16e602437062832c01eabae2451 /drivers/spi/spi-ppc4xx.c | |
| parent | Linux 4.3-rc1 (diff) | |
| download | linux-c15f6ed3a18f10cdc33f64906ab353f17a6df114.tar.xz linux-c15f6ed3a18f10cdc33f64906ab353f17a6df114.zip | |
spi: bitbang: Replace spinlock by mutex
chipselect (in the case of spi-gpio: spi_gpio_chipselect, which
calls gpiod_set_raw_value_cansleep) can sleep, so we should not
hold a spinlock while calling it from spi_bitbang_setup.
This issue was introduced by this commit, which converted spi-gpio
to cansleep variants:
d9dda5a191 "spi: spi-gpio: Use 'cansleep' variants to access GPIO"
Replacing the lock variable by a mutex fixes the issue: This is
safe as all instances where the lock is used are called from
contexts that can sleep.
Finally, update spi-ppc4xx and and spi-s3c24xx to use mutex
functions, as they directly hold the lock for similar purpose.
Signed-off-by: Nicolas Boichat <drinkcat@chromium.org>
Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'drivers/spi/spi-ppc4xx.c')
| -rw-r--r-- | drivers/spi/spi-ppc4xx.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/spi/spi-ppc4xx.c b/drivers/spi/spi-ppc4xx.c index 54fb984a3e17..dd3d0a218d8b 100644 --- a/drivers/spi/spi-ppc4xx.c +++ b/drivers/spi/spi-ppc4xx.c @@ -210,12 +210,12 @@ static int spi_ppc4xx_setupxfer(struct spi_device *spi, struct spi_transfer *t) if (in_8(&hw->regs->cdm) != cdm) out_8(&hw->regs->cdm, cdm); - spin_lock(&hw->bitbang.lock); + mutex_lock(&hw->bitbang.lock); if (!hw->bitbang.busy) { hw->bitbang.chipselect(spi, BITBANG_CS_INACTIVE); /* Need to ndelay here? */ } - spin_unlock(&hw->bitbang.lock); + mutex_unlock(&hw->bitbang.lock); return 0; } |