From ec21e6d415eaa97c93d883f99c2195a9a200baaa Mon Sep 17 00:00:00 2001 From: Kevin Hilman Date: Tue, 8 Dec 2009 16:34:25 -0700 Subject: [PATCH] --- yaml --- r: 175635 b: refs/heads/master c: d048ec7ab48254c505e1cee49441345ce12129fd h: refs/heads/master i: 175633: abf8917fe8f3875ebf48e8820d81eff5a43e1bb0 175631: 41ad8db00799d72c9701c373a1d7cf18cd2e2928 v: v3 --- [refs] | 2 +- trunk/arch/arm/plat-omap/omap_device.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index b56aac3889a8..79aacaff23e4 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 81d7c6ffccd1d5369942c428faa9ee25a3d59db8 +refs/heads/master: d048ec7ab48254c505e1cee49441345ce12129fd diff --git a/trunk/arch/arm/plat-omap/omap_device.c b/trunk/arch/arm/plat-omap/omap_device.c index 9a502af14f5b..51c9d560a0cd 100644 --- a/trunk/arch/arm/plat-omap/omap_device.c +++ b/trunk/arch/arm/plat-omap/omap_device.c @@ -142,7 +142,7 @@ static int _omap_device_activate(struct omap_device *od, u8 ignore_lat) read_persistent_clock(&b); c = timespec_sub(b, a); - act_lat = timespec_to_ns(&c) * NSEC_PER_USEC; + act_lat = timespec_to_ns(&c) / NSEC_PER_USEC; pr_debug("omap_device: %s: pm_lat %d: activate: elapsed time " "%llu usec\n", od->pdev.name, od->pm_lat_level, @@ -198,7 +198,7 @@ static int _omap_device_deactivate(struct omap_device *od, u8 ignore_lat) read_persistent_clock(&b); c = timespec_sub(b, a); - deact_lat = timespec_to_ns(&c) * NSEC_PER_USEC; + deact_lat = timespec_to_ns(&c) / NSEC_PER_USEC; pr_debug("omap_device: %s: pm_lat %d: deactivate: elapsed time " "%llu usec\n", od->pdev.name, od->pm_lat_level,