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

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

Merge tag 'hwmon-for-v4.20-rc2' of... 

Merge tag 'hwmon-for-v4.20-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging

Pull hwmon fixes from Guenter Roeck:

 - Remove bogus __init annotations in ibmpowernv driver

 - Fix double-free in error handling of __hwmon_device_register()

* tag 'hwmon-for-v4.20-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging:
  hwmon: (ibmpowernv) Remove bogus __init annotations
  hwmon: (core) Fix double-free in __hwmon_device_register()
parents e09d51ad e3e61f01

drivers/hwmon/hwmon.c

+4 −4
Original line number Diff line number Diff line
@@ -649,8 +649,10 @@ __hwmon_device_register(struct device *dev, const char *name, void *drvdata, 
				if (info[i]->config[j] & HWMON_T_INPUT) {

					err = hwmon_thermal_add_sensor(dev,

								hwdev, j);

					if (err)

						goto free_device;

					if (err) {

						device_unregister(hdev);

						goto ida_remove;

					}

				}

			}

		}
@@ -658,8 +660,6 @@ __hwmon_device_register(struct device *dev, const char *name, void *drvdata, 


	return hdev;



free_device:

	device_unregister(hdev);

free_hwmon:

	kfree(hwdev);

ida_remove:

drivers/hwmon/ibmpowernv.c

+3 −4
Original line number Diff line number Diff line
@@ -181,7 +181,7 @@ static ssize_t show_label(struct device *dev, struct device_attribute *devattr, 
	return sprintf(buf, "%s\n", sdata->label);

}



static int __init get_logical_cpu(int hwcpu)

static int get_logical_cpu(int hwcpu)

{

	int cpu;
@@ -192,9 +192,8 @@ static int __init get_logical_cpu(int hwcpu) 
	return -ENOENT;

}



static void __init make_sensor_label(struct device_node *np,

				     struct sensor_data *sdata,

				     const char *label)

static void make_sensor_label(struct device_node *np,

			      struct sensor_data *sdata, const char *label)

{

	u32 id;

	size_t n;