diff options
Diffstat (limited to 'drivers/hwmon/w83792d.c')
-rw-r--r-- | drivers/hwmon/w83792d.c | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/drivers/hwmon/w83792d.c b/drivers/hwmon/w83792d.c index 5cb83ddf2cc6..0b804895be43 100644 --- a/drivers/hwmon/w83792d.c +++ b/drivers/hwmon/w83792d.c | |||
@@ -54,8 +54,8 @@ static const unsigned short normal_i2c[] = { 0x2c, 0x2d, 0x2e, 0x2f, | |||
54 | 54 | ||
55 | static unsigned short force_subclients[4]; | 55 | static unsigned short force_subclients[4]; |
56 | module_param_array(force_subclients, short, NULL, 0); | 56 | module_param_array(force_subclients, short, NULL, 0); |
57 | MODULE_PARM_DESC(force_subclients, "List of subclient addresses: " | 57 | MODULE_PARM_DESC(force_subclients, |
58 | "{bus, clientaddr, subclientaddr1, subclientaddr2}"); | 58 | "List of subclient addresses: {bus, clientaddr, subclientaddr1, subclientaddr2}"); |
59 | 59 | ||
60 | static bool init; | 60 | static bool init; |
61 | module_param(init, bool, 0); | 61 | module_param(init, bool, 0); |
@@ -951,8 +951,8 @@ w83792d_detect_subclients(struct i2c_client *new_client) | |||
951 | for (i = 2; i <= 3; i++) { | 951 | for (i = 2; i <= 3; i++) { |
952 | if (force_subclients[i] < 0x48 || | 952 | if (force_subclients[i] < 0x48 || |
953 | force_subclients[i] > 0x4f) { | 953 | force_subclients[i] > 0x4f) { |
954 | dev_err(&new_client->dev, "invalid subclient " | 954 | dev_err(&new_client->dev, |
955 | "address %d; must be 0x48-0x4f\n", | 955 | "invalid subclient address %d; must be 0x48-0x4f\n", |
956 | force_subclients[i]); | 956 | force_subclients[i]); |
957 | err = -ENODEV; | 957 | err = -ENODEV; |
958 | goto ERROR_SC_0; | 958 | goto ERROR_SC_0; |
@@ -969,8 +969,9 @@ w83792d_detect_subclients(struct i2c_client *new_client) | |||
969 | if (!(val & 0x80)) { | 969 | if (!(val & 0x80)) { |
970 | if ((data->lm75[0] != NULL) && | 970 | if ((data->lm75[0] != NULL) && |
971 | ((val & 0x7) == ((val >> 4) & 0x7))) { | 971 | ((val & 0x7) == ((val >> 4) & 0x7))) { |
972 | dev_err(&new_client->dev, "duplicate addresses 0x%x, " | 972 | dev_err(&new_client->dev, |
973 | "use force_subclient\n", data->lm75[0]->addr); | 973 | "duplicate addresses 0x%x, use force_subclient\n", |
974 | data->lm75[0]->addr); | ||
974 | err = -ENODEV; | 975 | err = -ENODEV; |
975 | goto ERROR_SC_1; | 976 | goto ERROR_SC_1; |
976 | } | 977 | } |