From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 7C811C43381 for ; Thu, 21 Feb 2019 14:45:02 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 432082075A for ; Thu, 21 Feb 2019 14:45:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1550760302; bh=FweDaEeJ+DSs7VD60BFGczRiIZsKOdzk4FVZ76o09PA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=Vt3OM69T84HuvvPSb3KUt25ybMFcFLRmrE2YRy1h9yD7oJYjkR0yqawswFk0PcQaS wDtk6fKY5EAl+BeImCj4XlDmku7dXM2j8xemTvSnt99O9VvMw6zh/iSqu4Fhd6neUP bQgjvHFGBlEkGBqZKR6BIj5M3ZYJY/YDm50xdK3Y= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728491AbfBUOpA (ORCPT ); Thu, 21 Feb 2019 09:45:00 -0500 Received: from mail.kernel.org ([198.145.29.99]:39352 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729280AbfBUOn0 (ORCPT ); Thu, 21 Feb 2019 09:43:26 -0500 Received: from localhost (5356596B.cm-6-7b.dynamic.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 4B7902080D; Thu, 21 Feb 2019 14:43:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1550760205; bh=FweDaEeJ+DSs7VD60BFGczRiIZsKOdzk4FVZ76o09PA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=NuEqtyVp4HudmdU346WVnolQaJygAC6lxGspRbv2YCKQADxdeSGkWEJoM4YTWNauI ae+zJR0Wlrb8IF38f1yrwUso+V/R5Qah/6QpjKr0s+7boqnzZXhB/ApAL240LZ7cZc q1R7rtWFAkTchTSm2nC5/SC/v1ssc2+IjylIRfnk= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Wei Yongjun , Guenter Roeck , Sasha Levin Subject: [PATCH 4.20 28/32] hwmon: (lm80) Fix missing unlock on error in set_fan_div() Date: Thu, 21 Feb 2019 15:36:16 +0100 Message-Id: <20190221125252.574655085@linuxfoundation.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190221125250.855065214@linuxfoundation.org> References: <20190221125250.855065214@linuxfoundation.org> User-Agent: quilt/0.65 X-stable: review X-Patchwork-Hint: ignore MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 4.20-stable review patch. If anyone has any objections, please let me know. ------------------ [ Upstream commit 07bd14ccc3049f9c0147a91a4227a571f981601a ] 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 Signed-off-by: Guenter Roeck Signed-off-by: Sasha Levin --- 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 0e30fa00204cd..f9b8e3e23a8e8 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.19.1