---

yaml --- r: 326190 b: refs/heads/master c: 37f9648 h: refs/heads/master v: v3
git-mirror · Sep 24, 2012 · fbd0ce3 · fbd0ce3
1 parent 356dbc7
commit fbd0ce3
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git 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
@@ -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