diff options
| author |   Greg Kroah-Hartman <gregkh@suse.de> | 2009-01-28 15:42:43 -0800 |
|---|---|---|
| committer |   Greg Kroah-Hartman <gregkh@kvm.kroah.org> | 2009-01-28 15:49:05 -0800 |
| commit | 07960058f0ce77ddc3027d3e45a5de1fb977334f (patch) | |
| tree | 96432748b69401b02975c85f85ffb4333a892fb6 /drivers/staging | |
| parent | Staging: android: timed_gpio: Fix build to build on kernels after 2.6.25. (diff) | |
| download | linux-dev-07960058f0ce77ddc3027d3e45a5de1fb977334f.tar.xz linux-dev-07960058f0ce77ddc3027d3e45a5de1fb977334f.zip | |
Staging: android: fix build error on 64bit boxes
ktime_t isn't ment to directly access on all arches, so use the proper
conversion functions instead to figure out what time is remaining.
Reported-by: Randy Dunlap <randy.dunlap@oracle.com>
Cc: Arve Hjønnevåg <arve@android.com>
Cc: Mike Lockwood <lockwood@android.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging')
| -rw-r--r-- | drivers/staging/android/timed_gpio.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/staging/android/timed_gpio.c b/drivers/staging/android/timed_gpio.c index b41b20e34628..903270cbbe02 100644 --- a/drivers/staging/android/timed_gpio.c +++ b/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; |