| From 99ae3417672a6d4a3bf68d4fc43d7c6ca074d477 Mon Sep 17 00:00:00 2001 |
| From: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| Date: Mon, 3 May 2021 13:56:31 +0200 |
| Subject: Revert "hwmon: (lm80) fix a missing check of bus read in lm80 probe" |
| |
| From: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| |
| commit 99ae3417672a6d4a3bf68d4fc43d7c6ca074d477 upstream. |
| |
| This reverts commit 9aa3aa15f4c2f74f47afd6c5db4b420fadf3f315. |
| |
| Because of recent interactions with developers from @umn.edu, all |
| commits from them have been recently re-reviewed to ensure if they were |
| correct or not. |
| |
| Upon review, it was determined that this commit is not needed at all so |
| just revert it. Also, the call to lm80_init_client() was not properly |
| handled, so if error handling is needed in the lm80_probe() function, |
| then it should be done properly, not half-baked like the commit being |
| reverted here did. |
| |
| Cc: Kangjie Lu <kjlu@umn.edu> |
| Fixes: 9aa3aa15f4c2 ("hwmon: (lm80) fix a missing check of bus read in lm80 probe") |
| Cc: stable <stable@vger.kernel.org> |
| Acked-by: Guenter Roeck <linux@roeck-us.net> |
| Link: https://lore.kernel.org/r/20210503115736.2104747-5-gregkh@linuxfoundation.org |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| --- |
| drivers/hwmon/lm80.c | 11 ++--------- |
| 1 file changed, 2 insertions(+), 9 deletions(-) |
| |
| --- a/drivers/hwmon/lm80.c |
| +++ b/drivers/hwmon/lm80.c |
| @@ -630,7 +630,6 @@ static int lm80_probe(struct i2c_client |
| struct device *dev = &client->dev; |
| struct device *hwmon_dev; |
| struct lm80_data *data; |
| - int rv; |
| |
| data = devm_kzalloc(dev, sizeof(struct lm80_data), GFP_KERNEL); |
| if (!data) |
| @@ -643,14 +642,8 @@ static int lm80_probe(struct i2c_client |
| lm80_init_client(client); |
| |
| /* A few vars need to be filled upon startup */ |
| - rv = lm80_read_value(client, LM80_REG_FAN_MIN(1)); |
| - if (rv < 0) |
| - return rv; |
| - data->fan[f_min][0] = rv; |
| - rv = lm80_read_value(client, LM80_REG_FAN_MIN(2)); |
| - if (rv < 0) |
| - return rv; |
| - data->fan[f_min][1] = rv; |
| + data->fan[f_min][0] = lm80_read_value(client, LM80_REG_FAN_MIN(1)); |
| + data->fan[f_min][1] = lm80_read_value(client, LM80_REG_FAN_MIN(2)); |
| |
| hwmon_dev = devm_hwmon_device_register_with_groups(dev, client->name, |
| data, lm80_groups); |