public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
From: Greg Kroah-Hartman <gregkh@suse.de>
To: linux-kernel@vger.kernel.org
Cc: Greg Kroah-Hartman <gregkh@suse.de>,
	Mike Lockwood <lockwood@android.com>
Subject: [PATCH 5/6] Staging: android: fix up units in timed_gpio
Date: Mon,  9 Feb 2009 11:34:05 -0800	[thread overview]
Message-ID: <1234208046-2295-5-git-send-email-gregkh@suse.de> (raw)
In-Reply-To: <20090209193201.GB2194@kroah.com>

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>
---
 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 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;
 
-- 
1.6.0.2


  parent reply	other threads:[~2009-02-09 19:37 UTC|newest]

Thread overview: 7+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2009-02-09 19:32 [GIT PATCH] STAGING patches for 2.6-git Greg KH
2009-02-09 19:34 ` [PATCH 1/6] Revert Staging: at76_usb: update drivers/staging/at76_usb w/ mac80211 port Greg Kroah-Hartman
2009-02-09 19:34 ` [PATCH 2/6] Staging: at76_usb: fix bugs introduced by "Staging: at76_usb: cleanup dma on stack issues" Greg Kroah-Hartman
2009-02-09 19:34 ` [PATCH 3/6] Staging: at76_usb: Add support for OQO Model 01+ Greg Kroah-Hartman
2009-02-09 19:34 ` [PATCH 4/6] Staging: android: ram_console: Disable ECC when early init is enabled and validate buffer size Greg Kroah-Hartman
2009-02-09 19:34 ` Greg Kroah-Hartman [this message]
2009-02-09 19:34 ` [PATCH 6/6] Staging: panel: fix lcd panel driver build failure Greg Kroah-Hartman

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1234208046-2295-5-git-send-email-gregkh@suse.de \
    --to=gregkh@suse.de \
    --cc=linux-kernel@vger.kernel.org \
    --cc=lockwood@android.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox