summaryrefslogtreecommitdiffstats
path: root/drivers/hwmon
diff options
context:
space:
mode:
authorDan Carpenter <dan.carpenter@oracle.com>2016-10-12 09:24:52 +0300
committerGuenter Roeck <linux@roeck-us.net>2016-10-17 10:16:20 -0700
commit94cdc5608b5561aeda80edda9c9223608a1da6fc (patch)
treed900738ae22626517919cd55b3b127d6c331a991 /drivers/hwmon
parent667f4bab81ea8357d260aa14bb6fb1a4834248d5 (diff)
downloadlinux-0-day-94cdc5608b5561aeda80edda9c9223608a1da6fc.tar.gz
linux-0-day-94cdc5608b5561aeda80edda9c9223608a1da6fc.tar.xz
hwmon: (max31790) potential ERR_PTR dereference
We should only dereference "data" after we check if it is an error pointer. Fixes: 54187ff9d766 ('hwmon: (max31790) Convert to use new hwmon registration API') Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com> Signed-off-by: Guenter Roeck <linux@roeck-us.net>
Diffstat (limited to 'drivers/hwmon')
-rw-r--r--drivers/hwmon/max31790.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/hwmon/max31790.c b/drivers/hwmon/max31790.c
index bef84e0859730..c1b9275978f9d 100644
--- a/drivers/hwmon/max31790.c
+++ b/drivers/hwmon/max31790.c
@@ -268,11 +268,13 @@ static int max31790_read_pwm(struct device *dev, u32 attr, int channel,
long *val)
{
struct max31790_data *data = max31790_update_device(dev);
- u8 fan_config = data->fan_config[channel];
+ u8 fan_config;
if (IS_ERR(data))
return PTR_ERR(data);
+ fan_config = data->fan_config[channel];
+
switch (attr) {
case hwmon_pwm_input:
*val = data->pwm[channel] >> 8;