Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit dc99bf78 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/staging 

* 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/staging:
  hwmon: (ltc4215) make sysfs file match the alarm cause
parents 5d43a1de 0a6bf658

drivers/hwmon/ltc4215.c

+2 −2
Original line number Diff line number Diff line
@@ -205,7 +205,6 @@ LTC4215_ALARM(curr1_max_alarm, (1 << 2), LTC4215_STATUS); 


/* Power (virtual) */

LTC4215_POWER(power1_input);

LTC4215_ALARM(power1_alarm,	(1 << 3),	LTC4215_STATUS);



/* Input Voltage */

LTC4215_VOLTAGE(in1_input,			LTC4215_ADIN);
@@ -214,6 +213,7 @@ LTC4215_ALARM(in1_min_alarm, (1 << 1), LTC4215_STATUS); 


/* Output Voltage */

LTC4215_VOLTAGE(in2_input,			LTC4215_SOURCE);

LTC4215_ALARM(in2_min_alarm,	(1 << 3),	LTC4215_STATUS);



/* Finally, construct an array of pointers to members of the above objects,

 * as required for sysfs_create_group()
@@ -223,13 +223,13 @@ static struct attribute *ltc4215_attributes[] = { 
	&sensor_dev_attr_curr1_max_alarm.dev_attr.attr,



	&sensor_dev_attr_power1_input.dev_attr.attr,

	&sensor_dev_attr_power1_alarm.dev_attr.attr,



	&sensor_dev_attr_in1_input.dev_attr.attr,

	&sensor_dev_attr_in1_max_alarm.dev_attr.attr,

	&sensor_dev_attr_in1_min_alarm.dev_attr.attr,



	&sensor_dev_attr_in2_input.dev_attr.attr,

	&sensor_dev_attr_in2_min_alarm.dev_attr.attr,



	NULL,

};