From bce014682a86d2509ae87878e8f0649000426b05 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Wed, 4 Feb 2009 15:05:05 -0800 Subject: [PATCH] --- yaml --- r: 131161 b: refs/heads/master c: d88dfb8dc4bfb66066e7c68727c219faaa541206 h: refs/heads/master i: 131159: 3da185588cdad08e1a7afb38c2985a77dfca3512 v: v3 --- [refs] | 2 +- trunk/drivers/staging/android/timed_gpio.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 1b9623b6613c..e1c5163a571c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 5701c0519b7a357a602fda5c96f26197ecfc4c85 +refs/heads/master: d88dfb8dc4bfb66066e7c68727c219faaa541206 diff --git a/trunk/drivers/staging/android/timed_gpio.c b/trunk/drivers/staging/android/timed_gpio.c index 903270cbbe02..33daff0481d2 100644 --- a/trunk/drivers/staging/android/timed_gpio.c +++ b/trunk/drivers/staging/android/timed_gpio.c @@ -50,7 +50,7 @@ static ssize_t gpio_enable_show(struct device *dev, struct device_attribute *att if (hrtimer_active(&gpio_data->timer)) { ktime_t r = hrtimer_get_remaining(&gpio_data->timer); struct timeval t = ktime_to_timeval(r); - remaining = t.tv_sec * 1000 + t.tv_usec; + remaining = t.tv_sec * 1000 + t.tv_usec / 1000; } else remaining = 0;