Merge 4.7-rc4 into staging-next

[cascardo/linux.git] / drivers / iio / humidity / am2315.c

diff --git a/drivers/iio/humidity/am2315.c b/drivers/iio/humidity/am2315.c
index 8de39bd..3e200f6 100644 (file)
--- a/drivers/iio/humidity/am2315.c
+++ b/drivers/iio/humidity/am2315.c
@@ -165,10 +165,8 @@ static irqreturn_t am2315_trigger_handler(int irq, void *p)
        struct am2315_sensor_data sensor_data;
 
        ret = am2315_read_data(data, &sensor_data);
-       if (ret < 0) {
-               mutex_unlock(&data->lock);
+       if (ret < 0)
                goto err;
-       }
 
        mutex_lock(&data->lock);
        if (*(indio_dev->active_scan_mask) == AM2315_ALL_CHANNEL_MASK) {