Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs

[linux.git] / drivers / hwmon / ftsteutates.c

diff --git a/drivers/hwmon/ftsteutates.c b/drivers/hwmon/ftsteutates.c
index 0f0277e7aae5140015ed179cab6ef419800cd4c7..0801f48a41f7e6845703f1859a0a3358316811ef 100644 (file)
--- a/drivers/hwmon/ftsteutates.c
+++ b/drivers/hwmon/ftsteutates.c
@@ -60,7 +60,7 @@
 
 static const unsigned short normal_i2c[] = { 0x73, I2C_CLIENT_END };
 
-static struct i2c_device_id fts_id[] = {
+static const struct i2c_device_id fts_id[] = {
        { "ftsteutates", 0 },
        { }
 };
@@ -435,6 +435,7 @@ clear_temp_alarm(struct device *dev, struct device_attribute *devattr,
                goto error;
 
        data->valid = false;
+       ret = count;
 error:
        mutex_unlock(&data->update_lock);
        return ret;
@@ -508,6 +509,7 @@ clear_fan_alarm(struct device *dev, struct device_attribute *devattr,
                goto error;
 
        data->valid = false;
+       ret = count;
 error:
        mutex_unlock(&data->update_lock);
        return ret;