From 44fde312db73a12653f51630ac0bc4761554daee Mon Sep 17 00:00:00 2001 From: Tomi Valkeinen Date: Thu, 23 Feb 2012 12:21:09 +0200 Subject: [PATCH] --- yaml --- r: 294343 b: refs/heads/master c: 4614679c9d3b77e87b390b6afe8a8dfc980f4387 h: refs/heads/master i: 294341: 6860cacb5b9ee14b864576b9319a029fd21b53e1 294339: 1494cf09ca9c716bb6d46860472f1d6d09bcfaf3 294335: 8af3a707eb1d7877d8634ca51010fc6ada620cc9 v: v3 --- [refs] | 2 +- trunk/drivers/video/omap2/dss/apply.c | 11 ++++++----- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index 0a2cd16d74de..6fb6a0c5e2ea 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 21e56f79abad987555351c73569fc8358636b0fa +refs/heads/master: 4614679c9d3b77e87b390b6afe8a8dfc980f4387 diff --git a/trunk/drivers/video/omap2/dss/apply.c b/trunk/drivers/video/omap2/dss/apply.c index f145e9cd6edd..267c3f40d6c3 100644 --- a/trunk/drivers/video/omap2/dss/apply.c +++ b/trunk/drivers/video/omap2/dss/apply.c @@ -354,6 +354,7 @@ static void wait_pending_extra_info_updates(void) bool updating; unsigned long flags; unsigned long t; + int r; spin_lock_irqsave(&data_lock, flags); @@ -369,11 +370,11 @@ static void wait_pending_extra_info_updates(void) spin_unlock_irqrestore(&data_lock, flags); t = msecs_to_jiffies(500); - wait_for_completion_timeout(&extra_updated_completion, t); - - updating = extra_info_update_ongoing(); - - WARN_ON(updating); + r = wait_for_completion_timeout(&extra_updated_completion, t); + if (r == 0) + DSSWARN("timeout in wait_pending_extra_info_updates\n"); + else if (r < 0) + DSSERR("wait_pending_extra_info_updates failed: %d\n", r); } int dss_mgr_wait_for_go(struct omap_overlay_manager *mgr)