From 180118ccc0c266d57c2cf0bb9a5145ab428853e9 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Wed, 28 Jan 2009 15:42:43 -0800 Subject: [PATCH] --- yaml --- r: 130455 b: refs/heads/master c: 07960058f0ce77ddc3027d3e45a5de1fb977334f h: refs/heads/master i: 130453: 49c7f938e5b5508e83b6c1e871c6e069acc240b2 130451: cbaf707121930ddfea62c24b769b0650b739c671 130447: fc70cd8448a1a6a8edf2c22e0d4c2617b26b0a1b v: v3 --- [refs] | 2 +- trunk/drivers/staging/android/timed_gpio.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 2dbb39903eca..53396a32e217 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 2d0db6bf5010c26beb1ccbd4ee50991fd2c05d90 +refs/heads/master: 07960058f0ce77ddc3027d3e45a5de1fb977334f diff --git a/trunk/drivers/staging/android/timed_gpio.c b/trunk/drivers/staging/android/timed_gpio.c index b41b20e34628..903270cbbe02 100644 --- a/trunk/drivers/staging/android/timed_gpio.c +++ b/trunk/drivers/staging/android/timed_gpio.c @@ -49,7 +49,8 @@ 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); - remaining = r.tv.sec * 1000 + r.tv.nsec / 1000000; + struct timeval t = ktime_to_timeval(r); + remaining = t.tv_sec * 1000 + t.tv_usec; } else remaining = 0;