Merge branches 'slab/cleanups' and 'slab/fixes' into for-linus

[mv-sheeva.git] / drivers / hwmon / sht15.c

diff --git a/drivers/hwmon/sht15.c b/drivers/hwmon/sht15.c
index 56cd6004da36e1ec08f94e05b890f61239323c08..6290a259456e8fbae6d5df180cd9825033b46217 100644 (file)
--- a/drivers/hwmon/sht15.c
+++ b/drivers/hwmon/sht15.c
@@ -257,7 +257,7 @@ static inline int sht15_update_single_val(struct sht15_data *data,
                                 (data->flag == SHT15_READING_NOTHING),
                                 msecs_to_jiffies(timeout_msecs));
        if (ret == 0) {/* timeout occurred */
-               disable_irq_nosync(gpio_to_irq(data->pdata->gpio_data));;
+               disable_irq_nosync(gpio_to_irq(data->pdata->gpio_data));
                sht15_connection_reset(data);
                return -ETIME;
        }