summaryrefslogtreecommitdiffstats
path: root/drivers/iio
diff options
context:
space:
mode:
authorFrank Zago <frank@zago.net>2013-11-13 22:53:00 +0000
committerJonathan Cameron <jic23@kernel.org>2013-11-17 15:22:00 +0000
commit0ee005c7dc2803125275e24598f0fb37775a6af3 (patch)
tree5cd78266875e6c2888fddf78107dcac0a639a09c /drivers/iio
parentfe26980e03f435164777184a91c1e5f3b4ed22a5 (diff)
downloadtalos-obmc-linux-0ee005c7dc2803125275e24598f0fb37775a6af3.tar.gz
talos-obmc-linux-0ee005c7dc2803125275e24598f0fb37775a6af3.zip
iio:accel:kxsd9 fix missing mutex unlock
This will leave a lock held after reading from the device, preventing any further reads. Signed-off-by: Frank Zago <frank@zago.net> Cc: stable@vger.kernel.org Signed-off-by: Jonathan Cameron <jic23@kernel.org>
Diffstat (limited to 'drivers/iio')
-rw-r--r--drivers/iio/accel/kxsd9.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/iio/accel/kxsd9.c b/drivers/iio/accel/kxsd9.c
index d72118d1189c..98ba761cbb9c 100644
--- a/drivers/iio/accel/kxsd9.c
+++ b/drivers/iio/accel/kxsd9.c
@@ -112,9 +112,10 @@ static int kxsd9_read(struct iio_dev *indio_dev, u8 address)
mutex_lock(&st->buf_lock);
st->tx[0] = KXSD9_READ(address);
ret = spi_sync_transfer(st->us, xfers, ARRAY_SIZE(xfers));
- if (ret)
- return ret;
- return (((u16)(st->rx[0])) << 8) | (st->rx[1] & 0xF0);
+ if (!ret)
+ ret = (((u16)(st->rx[0])) << 8) | (st->rx[1] & 0xF0);
+ mutex_unlock(&st->buf_lock);
+ return ret;
}
static IIO_CONST_ATTR(accel_scale_available,
OpenPOWER on IntegriCloud