mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-30 11:41:38 -04:00
SPI: use mutex not semaphore
Make spi_write_then_read() use a mutex not a binary semaphore. Signed-off-by: David Brownell <[email protected]> Signed-off-by: Andrew Morton <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
This commit is contained in:
parent
f8fcc93319
commit
068f407086
1 changed files with 3 additions and 3 deletions
|
|
@ -589,7 +589,7 @@ int spi_write_then_read(struct spi_device *spi,
|
|||
const u8 *txbuf, unsigned n_tx,
|
||||
u8 *rxbuf, unsigned n_rx)
|
||||
{
|
||||
static DECLARE_MUTEX(lock);
|
||||
static DEFINE_MUTEX(lock);
|
||||
|
||||
int status;
|
||||
struct spi_message message;
|
||||
|
|
@ -615,7 +615,7 @@ int spi_write_then_read(struct spi_device *spi,
|
|||
}
|
||||
|
||||
/* ... unless someone else is using the pre-allocated buffer */
|
||||
if (down_trylock(&lock)) {
|
||||
if (!mutex_trylock(&lock)) {
|
||||
local_buf = kmalloc(SPI_BUFSIZ, GFP_KERNEL);
|
||||
if (!local_buf)
|
||||
return -ENOMEM;
|
||||
|
|
@ -634,7 +634,7 @@ int spi_write_then_read(struct spi_device *spi,
|
|||
}
|
||||
|
||||
if (x[0].tx_buf == buf)
|
||||
up(&lock);
|
||||
mutex_unlock(&lock);
|
||||
else
|
||||
kfree(local_buf);
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue