aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/staging
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@suse.de>2009-02-04 15:05:05 -0800
committerGreg Kroah-Hartman <gregkh@kvm.kroah.org>2009-02-09 11:26:18 -0800
commitd88dfb8dc4bfb66066e7c68727c219faaa541206 (patch)
treefcd93134f723549874d8c1e827fa8e4c001a3e63 /drivers/staging
parent5701c0519b7a357a602fda5c96f26197ecfc4c85 (diff)
downloadkernel_samsung_tuna-d88dfb8dc4bfb66066e7c68727c219faaa541206.zip
kernel_samsung_tuna-d88dfb8dc4bfb66066e7c68727c219faaa541206.tar.gz
kernel_samsung_tuna-d88dfb8dc4bfb66066e7c68727c219faaa541206.tar.bz2
Staging: android: fix up units in timed_gpio
The last build fix I did messed up the units of the sysfs file. This puts them back to be milliseconds, like they originally were. Thanks to Juha Motorsportcom for pointing this out. Reported-by: Juha Motorsportcom <juha_motorsportcom@luukku.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.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/staging/android/timed_gpio.c b/drivers/staging/android/timed_gpio.c
index 903270c..33daff0 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;