From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753187AbeDPRI3 (ORCPT ); Mon, 16 Apr 2018 13:08:29 -0400 Received: from relay1.mentorg.com ([192.94.38.131]:53364 "EHLO relay1.mentorg.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753099AbeDPRI2 (ORCPT ); Mon, 16 Apr 2018 13:08:28 -0400 Subject: [PATCH 1/1] hwmon: (ina2xx) initialize mutex before locking CC: , , , , chombour , ahsann , From: Ahsan Hussain Organization: Mentor Graphics Message-ID: Date: Mon, 16 Apr 2018 22:08:19 +0500 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.7.0 MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Language: en-US Content-Transfer-Encoding: 7bit X-Originating-IP: [137.202.0.87] X-ClientProxiedBy: svr-ies-mbx-01.mgc.mentorg.com (139.181.222.1) To svr-ies-mbx-02.mgc.mentorg.com (139.181.222.2) To: unlisted-recipients:; (no To-header on input) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Upstream commit 8d008c0c ("hwmon: (ina2xx) Make calibration register value fixed") makes ina2xx_set_shunt() call mutex_lock on an un-initialized mutex. Initialize it prior so we don't get a NULL pointer dereference error Signed-off-by: Ahsan Hussain --- drivers/hwmon/ina2xx.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/hwmon/ina2xx.c b/drivers/hwmon/ina2xx.c index a629f7c..1304f01 100644 --- a/drivers/hwmon/ina2xx.c +++ b/drivers/hwmon/ina2xx.c @@ -457,6 +457,8 @@ static int ina2xx_probe(struct i2c_client *client, val = INA2XX_RSHUNT_DEFAULT; } + mutex_init(&data->config_lock); + ina2xx_set_shunt(data, val); ina2xx_regmap_config.max_register = data->config->registers; @@ -473,8 +475,6 @@ static int ina2xx_probe(struct i2c_client *client, return -ENODEV; } - mutex_init(&data->config_lock); - data->groups[group++] = &ina2xx_group; if (id->driver_data == ina226) data->groups[group++] = &ina226_group; -- 2.7.4