diff options
Diffstat (limited to 'drivers/hwmon/asb100.c')
-rw-r--r-- | drivers/hwmon/asb100.c | 23 |
1 files changed, 13 insertions, 10 deletions
diff --git a/drivers/hwmon/asb100.c b/drivers/hwmon/asb100.c index 6ac612cabda1..f96063680e58 100644 --- a/drivers/hwmon/asb100.c +++ b/drivers/hwmon/asb100.c | |||
@@ -55,8 +55,8 @@ static const unsigned short normal_i2c[] = { 0x2d, I2C_CLIENT_END }; | |||
55 | 55 | ||
56 | static unsigned short force_subclients[4]; | 56 | static unsigned short force_subclients[4]; |
57 | module_param_array(force_subclients, short, NULL, 0); | 57 | module_param_array(force_subclients, short, NULL, 0); |
58 | MODULE_PARM_DESC(force_subclients, "List of subclient addresses: " | 58 | MODULE_PARM_DESC(force_subclients, |
59 | "{bus, clientaddr, subclientaddr1, subclientaddr2}"); | 59 | "List of subclient addresses: {bus, clientaddr, subclientaddr1, subclientaddr2}"); |
60 | 60 | ||
61 | /* Voltage IN registers 0-6 */ | 61 | /* Voltage IN registers 0-6 */ |
62 | #define ASB100_REG_IN(nr) (0x20 + (nr)) | 62 | #define ASB100_REG_IN(nr) (0x20 + (nr)) |
@@ -689,8 +689,8 @@ static int asb100_detect_subclients(struct i2c_client *client) | |||
689 | for (i = 2; i <= 3; i++) { | 689 | for (i = 2; i <= 3; i++) { |
690 | if (force_subclients[i] < 0x48 || | 690 | if (force_subclients[i] < 0x48 || |
691 | force_subclients[i] > 0x4f) { | 691 | force_subclients[i] > 0x4f) { |
692 | dev_err(&client->dev, "invalid subclient " | 692 | dev_err(&client->dev, |
693 | "address %d; must be 0x48-0x4f\n", | 693 | "invalid subclient address %d; must be 0x48-0x4f\n", |
694 | force_subclients[i]); | 694 | force_subclients[i]); |
695 | err = -ENODEV; | 695 | err = -ENODEV; |
696 | goto ERROR_SC_2; | 696 | goto ERROR_SC_2; |
@@ -708,24 +708,27 @@ static int asb100_detect_subclients(struct i2c_client *client) | |||
708 | } | 708 | } |
709 | 709 | ||
710 | if (sc_addr[0] == sc_addr[1]) { | 710 | if (sc_addr[0] == sc_addr[1]) { |
711 | dev_err(&client->dev, "duplicate addresses 0x%x " | 711 | dev_err(&client->dev, |
712 | "for subclients\n", sc_addr[0]); | 712 | "duplicate addresses 0x%x for subclients\n", |
713 | sc_addr[0]); | ||
713 | err = -ENODEV; | 714 | err = -ENODEV; |
714 | goto ERROR_SC_2; | 715 | goto ERROR_SC_2; |
715 | } | 716 | } |
716 | 717 | ||
717 | data->lm75[0] = i2c_new_dummy(adapter, sc_addr[0]); | 718 | data->lm75[0] = i2c_new_dummy(adapter, sc_addr[0]); |
718 | if (!data->lm75[0]) { | 719 | if (!data->lm75[0]) { |
719 | dev_err(&client->dev, "subclient %d registration " | 720 | dev_err(&client->dev, |
720 | "at address 0x%x failed.\n", 1, sc_addr[0]); | 721 | "subclient %d registration at address 0x%x failed.\n", |
722 | 1, sc_addr[0]); | ||
721 | err = -ENOMEM; | 723 | err = -ENOMEM; |
722 | goto ERROR_SC_2; | 724 | goto ERROR_SC_2; |
723 | } | 725 | } |
724 | 726 | ||
725 | data->lm75[1] = i2c_new_dummy(adapter, sc_addr[1]); | 727 | data->lm75[1] = i2c_new_dummy(adapter, sc_addr[1]); |
726 | if (!data->lm75[1]) { | 728 | if (!data->lm75[1]) { |
727 | dev_err(&client->dev, "subclient %d registration " | 729 | dev_err(&client->dev, |
728 | "at address 0x%x failed.\n", 2, sc_addr[1]); | 730 | "subclient %d registration at address 0x%x failed.\n", |
731 | 2, sc_addr[1]); | ||
729 | err = -ENOMEM; | 732 | err = -ENOMEM; |
730 | goto ERROR_SC_3; | 733 | goto ERROR_SC_3; |
731 | } | 734 | } |