From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754208AbbIPODK (ORCPT ); Wed, 16 Sep 2015 10:03:10 -0400 Received: from mail-pa0-f52.google.com ([209.85.220.52]:35135 "EHLO mail-pa0-f52.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752818AbbIPODI (ORCPT ); Wed, 16 Sep 2015 10:03:08 -0400 From: Sudip Mukherjee To: Jean Delvare , Guenter Roeck Cc: linux-kernel@vger.kernel.org, lm-sensors@lm-sensors.org, Sudip Mukherjee Subject: [PATCH] hwmon: max31790: fix dereference of ERR_PTR Date: Wed, 16 Sep 2015 19:32:59 +0530 Message-Id: <1442412179-1547-1-git-send-email-sudipm.mukherjee@gmail.com> X-Mailer: git-send-email 1.9.1 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org max31790_update_device() return the error code in ERR_PTR. We were checking if it has returned error or not but before checking we have dereferenced it. Signed-off-by: Sudip Mukherjee --- drivers/hwmon/max31790.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/hwmon/max31790.c b/drivers/hwmon/max31790.c index f129668..69c0ac8 100644 --- a/drivers/hwmon/max31790.c +++ b/drivers/hwmon/max31790.c @@ -174,12 +174,12 @@ static ssize_t get_fan(struct device *dev, { struct sensor_device_attribute *attr = to_sensor_dev_attr(devattr); struct max31790_data *data = max31790_update_device(dev); - int sr = get_tach_period(data->fan_dynamics[attr->index]); - int rpm; + int sr, rpm; if (IS_ERR(data)) return PTR_ERR(data); + sr = get_tach_period(data->fan_dynamics[attr->index]); rpm = RPM_FROM_REG(data->tach[attr->index], sr); return sprintf(buf, "%d\n", rpm); @@ -190,12 +190,12 @@ static ssize_t get_fan_target(struct device *dev, { struct sensor_device_attribute *attr = to_sensor_dev_attr(devattr); struct max31790_data *data = max31790_update_device(dev); - int sr = get_tach_period(data->fan_dynamics[attr->index]); - int rpm; + int sr, rpm; if (IS_ERR(data)) return PTR_ERR(data); + sr = get_tach_period(data->fan_dynamics[attr->index]); rpm = RPM_FROM_REG(data->target_count[attr->index], sr); return sprintf(buf, "%d\n", rpm); -- 1.9.1