| From 6b19b66013cfe608d63f0dab38834bbaceb0217a Mon Sep 17 00:00:00 2001 |
| From: Arnaud Ebalard <arno@natisbad.org> |
| Date: Wed, 19 Nov 2014 22:52:36 +0100 |
| Subject: hwmon: (g762) fix call to devm_hwmon_device_register_with_groups() |
| |
| From: Arnaud Ebalard <arno@natisbad.org> |
| |
| commit 6b19b66013cfe608d63f0dab38834bbaceb0217a upstream. |
| |
| g762_remove() needs to first call hwmon_device_unregister() and then |
| g762_of_clock_disable(). For that reason, it is not possible to |
| convert it to devm_hwmon_device_register_with_groups() and the |
| the non device managed version must be used. |
| |
| This is correctly stated in commit message for 398e16db6262 ("hwmon: |
| (g762) Convert to hwmon_device_register_with_groups") but the |
| associated changes do in fact introduce a call to the device managed |
| version of the function. |
| |
| This patch fixes that typo by switching to the non devm_ version. |
| |
| Fixes: 398e16db6262 ("hwmon: (g762) Convert to hwmon_device_register_with_groups") |
| Signed-off-by: Arnaud Ebalard <arno@natisbad.org> |
| Signed-off-by: Guenter Roeck <linux@roeck-us.net> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| |
| --- |
| drivers/hwmon/g762.c | 6 ++---- |
| 1 file changed, 2 insertions(+), 4 deletions(-) |
| |
| --- a/drivers/hwmon/g762.c |
| +++ b/drivers/hwmon/g762.c |
| @@ -1084,10 +1084,8 @@ static int g762_probe(struct i2c_client |
| 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; |
