Commit a6e4a05a authored Nov 25, 2014 by Linus Torvalds

Merge tag 'hwmon-for-linus-v3.18-rc7' of...

Merge tag 'hwmon-for-linus-v3.18-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging

Pull a hwmon fix from Guenter Roeck:
 "Fix hwmon registration problem in g762 driver"

* tag 'hwmon-for-linus-v3.18-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging:
  hwmon: (g762) fix call to devm_hwmon_device_register_with_groups()

parents a7e90924 6b19b660

drivers/hwmon/g762.c

+2 −4

Original line number	Diff line number	Diff line
		@@ -1084,10 +1084,8 @@ static int g762_probe(struct i2c_client client, const struct i2c_device_id id)
		if (ret)
		goto clock_dis;

		data->hwmon_dev = devm_hwmon_device_register_with_groups(dev,
		client->name,
		data,
		g762_groups);
		data->hwmon_dev = hwmon_device_register_with_groups(dev, client->name,
		data, g762_groups);
		if (IS_ERR(data->hwmon_dev)) {
		ret = PTR_ERR(data->hwmon_dev);
		goto clock_dis;