summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2014-11-25 18:11:15 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2014-11-25 18:11:15 -0800
commita6e4a05af981c9db3ae5e41723827c5290f0e273 (patch)
tree9c4019bc279990d068847a75ee5a7fe15eaa4532 /drivers
parenta7e90924e167f9dd86633a959e31168c9bed4fb1 (diff)
parent6b19b66013cfe608d63f0dab38834bbaceb0217a (diff)
downloadlinux-a6e4a05af981c9db3ae5e41723827c5290f0e273.tar.bz2
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()
Diffstat (limited to 'drivers')
-rw-r--r--drivers/hwmon/g762.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/hwmon/g762.c b/drivers/hwmon/g762.c
index 6aac695b1688..9b55e673b67c 100644
--- a/drivers/hwmon/g762.c
+++ b/drivers/hwmon/g762.c
@@ -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;