diff --git a/[refs] b/[refs] index 8dd82d0b2645..1ef756a7d78c 100644 --- 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 index 3c534aba6272..b088abc0f45b 100644 --- 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;