From: Bernhard Walle <bernhard@bwalle.de>
Date: Sun, 19 Feb 2012 17:28:01 +0000 (+0100)
Subject: misc: bmp085: Handle jiffies overflow correctly
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=3734f7858f4334d51c1cd77deff3e1e66517e261;p=deliverable%2Flinux.git

misc: bmp085: Handle jiffies overflow correctly

By using the time_is_before_jiffies() macro instead of normal
arithmetic, the jiffies overflow is handled correctly.

Signed-off-by: Bernhard Walle <bernhard@bwalle.de>
Acked-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---

diff --git a/drivers/misc/bmp085.c b/drivers/misc/bmp085.c
index 3c534aba6272..b088abc0f45b 100644
--- a/drivers/misc/bmp085.c
+++ b/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;