diff options
author | Guenter Roeck <linux@roeck-us.net> | 2013-06-23 16:04:04 -0400 |
---|---|---|
committer | Guenter Roeck <linux@roeck-us.net> | 2013-06-27 13:31:43 -0400 |
commit | 41fa9a944fce1d7efd5ee3d50ac85b92f42dcc3d (patch) | |
tree | 477dbabb43c664cc16f3c1357888f1640460a6ad /drivers/hwmon | |
parent | b1d2bff6a61140454b9d203519cc686a2e9ef32f (diff) |
hwmon: (nct6775) Drop unsupported fan alarm attributes for NCT6775
NCT6775 does not support alarms for fans 4 and 5. Drop the attributes.
cc: stable@vger.kernel.org # 3.10+
Signed-off-by: Guenter Roeck <linux@roeck-us.net>
Diffstat (limited to 'drivers/hwmon')
-rw-r--r-- | drivers/hwmon/nct6775.c | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/drivers/hwmon/nct6775.c b/drivers/hwmon/nct6775.c index 2405ab439e80..99cec1825420 100644 --- a/drivers/hwmon/nct6775.c +++ b/drivers/hwmon/nct6775.c | |||
@@ -199,7 +199,7 @@ static const s8 NCT6775_ALARM_BITS[] = { | |||
199 | 0, 1, 2, 3, 8, 21, 20, 16, /* in0.. in7 */ | 199 | 0, 1, 2, 3, 8, 21, 20, 16, /* in0.. in7 */ |
200 | 17, -1, -1, -1, -1, -1, -1, /* in8..in14 */ | 200 | 17, -1, -1, -1, -1, -1, -1, /* in8..in14 */ |
201 | -1, /* unused */ | 201 | -1, /* unused */ |
202 | 6, 7, 11, 10, 23, /* fan1..fan5 */ | 202 | 6, 7, 11, -1, -1, /* fan1..fan5 */ |
203 | -1, -1, -1, /* unused */ | 203 | -1, -1, -1, /* unused */ |
204 | 4, 5, 13, -1, -1, -1, /* temp1..temp6 */ | 204 | 4, 5, 13, -1, -1, -1, /* temp1..temp6 */ |
205 | 12, -1 }; /* intrusion0, intrusion1 */ | 205 | 12, -1 }; /* intrusion0, intrusion1 */ |
@@ -3877,10 +3877,12 @@ static int nct6775_probe(struct platform_device *pdev) | |||
3877 | &sda_fan_input[i].dev_attr); | 3877 | &sda_fan_input[i].dev_attr); |
3878 | if (err) | 3878 | if (err) |
3879 | goto exit_remove; | 3879 | goto exit_remove; |
3880 | err = device_create_file(dev, | 3880 | if (data->ALARM_BITS[FAN_ALARM_BASE + i] >= 0) { |
3881 | &sda_fan_alarm[i].dev_attr); | 3881 | err = device_create_file(dev, |
3882 | if (err) | 3882 | &sda_fan_alarm[i].dev_attr); |
3883 | goto exit_remove; | 3883 | if (err) |
3884 | goto exit_remove; | ||
3885 | } | ||
3884 | if (data->kind != nct6776 && | 3886 | if (data->kind != nct6776 && |
3885 | data->kind != nct6779) { | 3887 | data->kind != nct6779) { |
3886 | err = device_create_file(dev, | 3888 | err = device_create_file(dev, |