From fbd0ce34b9f44158b9fb7622666569d0feff9b5e Mon Sep 17 00:00:00 2001 From: Dan Carpenter Date: Wed, 15 Aug 2012 10:49:43 +0300 Subject: [PATCH] --- yaml --- r: 326190 b: refs/heads/master c: 37f9648b2745fc3830f3715a601f7f94296de838 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/hwmon/adt7410.c | 9 +++++++-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 0d4760da25cf..67bce09578a1 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 983b97bed21e392280e80f704e97170b76cb7f3e +refs/heads/master: 37f9648b2745fc3830f3715a601f7f94296de838 diff --git a/trunk/drivers/hwmon/adt7410.c b/trunk/drivers/hwmon/adt7410.c index f8606dff3d1c..030c8d7c33a5 100644 --- a/trunk/drivers/hwmon/adt7410.c +++ b/trunk/drivers/hwmon/adt7410.c @@ -236,9 +236,14 @@ static ssize_t adt7410_show_t_hyst(struct device *dev, char *buf) { struct sensor_device_attribute *attr = to_sensor_dev_attr(da); - struct adt7410_data *data = adt7410_update_device(dev); + struct adt7410_data *data; int nr = attr->index; - int hyst = (data->hyst & ADT7410_T_HYST_MASK) * 1000; + int hyst; + + data = adt7410_update_device(dev); + if (IS_ERR(data)) + return PTR_ERR(data); + hyst = (data->hyst & ADT7410_T_HYST_MASK) * 1000; /* * hysteresis is stored as a 4 bit offset in the device, convert it