---

yaml --- r: 288814 b: refs/heads/master c: 3734f78 h: refs/heads/master v: v3
git-mirror · Feb 24, 2012 · f269037 · f269037
1 parent 5ea0b37
commit f269037
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ef77d83fd7a2f37a20d9e37ac156f18e7e105c75
+refs/heads/master: 3734f7858f4334d51c1cd77deff3e1e66517e261
diff --git a/trunk/drivers/misc/bmp085.c b/trunk/drivers/misc/bmp085.c
@@ -234,7 +234,8 @@ static s32 bmp085_get_pressure(struct bmp085_data *data, int *pressure)
 	int status;
 
 	/* alt least every second force an update of the ambient temperature */
-	if (data->last_temp_measurement + 1*HZ < jiffies) {
+	if (data->last_temp_measurement == 0 ||
+			time_is_before_jiffies(data->last_temp_measurement + 1*HZ)) {
 		status = bmp085_get_temperature(data, NULL);
 		if (status != 0)
 			goto exit;