diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2009-02-09 13:58:40 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-02-09 13:58:40 -0800 |
| commit | 7d1676629e9262f441540ecb0cde57e5cafc632f (patch) | |
| tree | f60ad97a2253e76f2e2f04727f43beda787a309f /drivers/staging/android/timed_gpio.c | |
| parent | Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/davej/cpufreq (diff) | |
| parent | Staging: panel: fix lcd panel driver build failure (diff) | |
| download | linux-dev-7d1676629e9262f441540ecb0cde57e5cafc632f.tar.xz linux-dev-7d1676629e9262f441540ecb0cde57e5cafc632f.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6:
Staging: panel: fix lcd panel driver build failure
Staging: android: fix up units in timed_gpio
Staging: android: ram_console: Disable ECC when early init is enabled and validate buffer size
Staging: at76_usb: Add support for OQO Model 01+
Staging: at76_usb: fix bugs introduced by "Staging: at76_usb: cleanup dma on stack issues"
Revert Staging: at76_usb: update drivers/staging/at76_usb w/ mac80211 port
Diffstat (limited to 'drivers/staging/android/timed_gpio.c')
| -rw-r--r-- | drivers/staging/android/timed_gpio.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/staging/android/timed_gpio.c b/drivers/staging/android/timed_gpio.c index 903270cbbe02..33daff0481d2 100644 --- a/drivers/staging/android/timed_gpio.c +++ b/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; |