The deactivate hook should use 'deactivate_lat' instead of 'activate_lat' when doing checking on expected latency values. Signed-off-by: Kevin Hilman <khilman@xxxxxxxxxxxxxxxxxxx> --- arch/arm/plat-omap/omap_device.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/arm/plat-omap/omap_device.c b/arch/arm/plat-omap/omap_device.c index bb16e62..da649f2 100644 --- a/arch/arm/plat-omap/omap_device.c +++ b/arch/arm/plat-omap/omap_device.c @@ -186,7 +186,7 @@ static int _omap_device_deactivate(struct omap_device *od, u8 ignore_lat) odpl = od->pm_lats + od->pm_lat_level; if (!ignore_lat && - ((od->dev_wakeup_lat + odpl->activate_lat) > + ((od->dev_wakeup_lat + odpl->deactivate_lat) > od->_dev_wakeup_lat_limit)) break; @@ -209,7 +209,7 @@ static int _omap_device_deactivate(struct omap_device *od, u8 ignore_lat) "(%llu > %d)\n", od->pdev.name, od->pdev.id, od->pm_lat_level, deact_lat, odpl->deactivate_lat); - od->dev_wakeup_lat += odpl->activate_lat; + od->dev_wakeup_lat += odpl->deactivate_lat; od->pm_lat_level++; } -- 1.6.5.1 -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
