Merge branch 'drm-next' of git://people.freedesktop.org/~airlied/linux

[karo-tx-linux.git] / drivers / hwmon / w83781d.c

diff --git a/drivers/hwmon/w83781d.c b/drivers/hwmon/w83781d.c
index c11452ebe18f0a57150703ddd8ded6759b151552..5a5046d94c3eee8288cf5871655fffa973d97977 100644 (file)
--- a/drivers/hwmon/w83781d.c
+++ b/drivers/hwmon/w83781d.c
@@ -867,6 +867,7 @@ w83781d_detect_subclients(struct i2c_client *new_client)
        struct i2c_adapter *adapter = new_client->adapter;
        struct w83781d_data *data = i2c_get_clientdata(new_client);
        enum chips kind = data->type;
+       int num_sc = 1;
 
        id = i2c_adapter_id(adapter);
 
@@ -891,6 +892,7 @@ w83781d_detect_subclients(struct i2c_client *new_client)
        }
 
        if (kind != w83783s) {
+               num_sc = 2;
                if (force_subclients[0] == id &&
                    force_subclients[1] == address) {
                        sc_addr[1] = force_subclients[3];
@@ -906,7 +908,7 @@ w83781d_detect_subclients(struct i2c_client *new_client)
                }
        }
 
-       for (i = 0; i <= 1; i++) {
+       for (i = 0; i < num_sc; i++) {
                data->lm75[i] = i2c_new_dummy(adapter, sc_addr[i]);
                if (!data->lm75[i]) {
                        dev_err(&new_client->dev, "Subclient %d "
@@ -917,8 +919,6 @@ w83781d_detect_subclients(struct i2c_client *new_client)
                                goto ERROR_SC_3;
                        goto ERROR_SC_2;
                }
-               if (kind == w83783s)
-                       break;
        }
 
        return 0;