request for 4.14-stable: 07bd14ccc304 ("hwmon: (lm80) Fix missing unlock on error in set_fan_div()")

request for 4.14-stable: 07bd14ccc304 ("hwmon: (lm80) Fix missing unlock on error in set_fan_div()")

[Sudip Mukherjee]

[-- Attachment #1: Type: text/plain, Size: 146 bytes --]

Hi Greg,

This was not marked for stable but the commit which it fixes is in
stable.
Please apply to your queue of 4.14-stable.

--
Regards
Sudip

[-- Attachment #2: 0001-hwmon-lm80-Fix-missing-unlock-on-error-in-set_fan_di.patch --]
[-- Type: text/x-diff, Size: 1250 bytes --]

From f32d692377ac234158dbcbb393d0b32a3c8980df Mon Sep 17 00:00:00 2001
From: Wei Yongjun <weiyongjun1@huawei.com>
Date: Wed, 26 Dec 2018 11:28:24 +0000
Subject: [PATCH] hwmon: (lm80) Fix missing unlock on error in set_fan_div()

commit 07bd14ccc3049f9c0147a91a4227a571f981601a upstream

Add the missing unlock before return from function set_fan_div()
in the error handling case.

Fixes: c9c63915519b ("hwmon: (lm80) fix a missing check of the status of SMBus read")
Signed-off-by: Wei Yongjun <weiyongjun1@huawei.com>
Signed-off-by: Guenter Roeck <linux@roeck-us.net>
Signed-off-by: Sudip Mukherjee <sudipm.mukherjee@gmail.com>
---
 drivers/hwmon/lm80.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/drivers/hwmon/lm80.c b/drivers/hwmon/lm80.c
index 0e30fa00204c..f9b8e3e23a8e 100644
--- a/drivers/hwmon/lm80.c
+++ b/drivers/hwmon/lm80.c
@@ -393,8 +393,10 @@ static ssize_t set_fan_div(struct device *dev, struct device_attribute *attr,
 	}
 
 	rv = lm80_read_value(client, LM80_REG_FANDIV);
-	if (rv < 0)
+	if (rv < 0) {
+		mutex_unlock(&data->update_lock);
 		return rv;
+	}
 	reg = (rv & ~(3 << (2 * (nr + 1))))
 	    | (data->fan_div[nr] << (2 * (nr + 1)));
 	lm80_write_value(client, LM80_REG_FANDIV, reg);
-- 
2.11.0

Re: request for 4.14-stable: 07bd14ccc304 ("hwmon: (lm80) Fix missing unlock on error in set_fan_div()")

[Sasha Levin]

On Tue, Feb 19, 2019 at 09:55:25PM +0000, Sudip Mukherjee wrote:
>Hi Greg,
>
>This was not marked for stable but the commit which it fixes is in
>stable.
>Please apply to your queue of 4.14-stable.

Queued, thank you.

--
Thanks,
Sasha

Re: request for 4.14-stable: 07bd14ccc304 ("hwmon: (lm80) Fix missing unlock on error in set_fan_div()")

[Greg Kroah-Hartman]

On Wed, Feb 20, 2019 at 11:00:49PM -0500, Sasha Levin wrote:
> On Tue, Feb 19, 2019 at 09:55:25PM +0000, Sudip Mukherjee wrote:
> > Hi Greg,
> > 
> > This was not marked for stable but the commit which it fixes is in
> > stable.
> > Please apply to your queue of 4.14-stable.
> 
> Queued, thank you.

You added this to 4.4.y, 4.9.y, and 4.20.y queues, but forgot 4.19.y and
3.18.y.  Any specific reason?

thanks,

greg k-h

Re: request for 4.14-stable: 07bd14ccc304 ("hwmon: (lm80) Fix missing unlock on error in set_fan_div()")

[Greg Kroah-Hartman]

On Thu, Feb 21, 2019 at 12:39:36PM +0100, Greg Kroah-Hartman wrote:
> On Wed, Feb 20, 2019 at 11:00:49PM -0500, Sasha Levin wrote:
> > On Tue, Feb 19, 2019 at 09:55:25PM +0000, Sudip Mukherjee wrote:
> > > Hi Greg,
> > > 
> > > This was not marked for stable but the commit which it fixes is in
> > > stable.
> > > Please apply to your queue of 4.14-stable.
> > 
> > Queued, thank you.
> 
> You added this to 4.4.y, 4.9.y, and 4.20.y queues, but forgot 4.19.y and
> 3.18.y.  Any specific reason?

You also added it to 4.14.y, missed that one.