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

Commit 8b9f2caa 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/jdelvare/staging 

* 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging:
  hwmon: (abituguru3) DMI probing for AB9, AB9 QuadQT and IX38 QuadGT
  hwmon: (sht15) Remove unnecessary semicolon
  hwmon: (max6650) Fix lock imbalance
parents 81e4e1ba ec05a8d7

drivers/hwmon/abituguru3.c

+3 −3
Original line number Diff line number Diff line
@@ -357,7 +357,7 @@ static const struct abituguru3_motherboard_info abituguru3_motherboards[] = { 
		{ "AUX5 Fan",		39, 2, 60, 1, 0 },

		{ NULL, 0, 0, 0, 0, 0 } }

	},

	{ 0x0014, NULL /* Abit AB9 Pro, need DMI string */, {

	{ 0x0014, "AB9", /* + AB9 Pro */ {

		{ "CPU Core",		 0, 0, 10, 1, 0 },

		{ "DDR",		 1, 0, 10, 1, 0 },

		{ "DDR VTT",		 2, 0, 10, 1, 0 },
@@ -455,7 +455,7 @@ static const struct abituguru3_motherboard_info abituguru3_motherboards[] = { 
		{ "AUX3 FAN",		37, 2, 60, 1, 0 },

		{ NULL, 0, 0, 0, 0, 0 } }

	},

	{ 0x0018, NULL /* Unknown, need DMI string */, {

	{ 0x0018, "AB9 QuadGT", {

		{ "CPU Core",		 0, 0, 10, 1, 0 },

		{ "DDR2",		 1, 0, 20, 1, 0 },

		{ "DDR2 VTT",		 2, 0, 10, 1, 0 },
@@ -564,7 +564,7 @@ static const struct abituguru3_motherboard_info abituguru3_motherboards[] = { 
		{ "AUX3 Fan",		36, 2, 60, 1, 0 },

		{ NULL, 0, 0, 0, 0, 0 } }

	},

	{ 0x001C, NULL /* Unknown, need DMI string */, {

	{ 0x001C, "IX38 QuadGT", {

		{ "CPU Core",		 0, 0, 10, 1, 0 },

		{ "DDR2",		 1, 0, 20, 1, 0 },

		{ "DDR2 VTT",		 2, 0, 10, 1, 0 },

drivers/hwmon/max6650.c

+1 −0
Original line number Diff line number Diff line
@@ -418,6 +418,7 @@ static ssize_t set_div(struct device *dev, struct device_attribute *devattr, 
		data->count = 3;

		break;

	default:

		mutex_unlock(&data->update_lock);

		dev_err(&client->dev,

			"illegal value for fan divider (%d)\n", div);

		return -EINVAL;

drivers/hwmon/sht15.c

+1 −1
Original line number Diff line number Diff line
@@ -257,7 +257,7 @@ static inline int sht15_update_single_val(struct sht15_data *data, 
				 (data->flag == SHT15_READING_NOTHING),

				 msecs_to_jiffies(timeout_msecs));

	if (ret == 0) {/* timeout occurred */

		disable_irq_nosync(gpio_to_irq(data->pdata->gpio_data));;

		disable_irq_nosync(gpio_to_irq(data->pdata->gpio_data));

		sht15_connection_reset(data);

		return -ETIME;

	}