From e637c695952b2d935de67338b80dbc21486d13a3 Mon Sep 17 00:00:00 2001 From: Sylwester Nawrocki Date: Thu, 17 Nov 2011 06:23:21 -0300 Subject: [PATCH] --- yaml --- r: 285737 b: refs/heads/master c: f664684a56deb7675363e2fa3f1e2a5eedbb3222 h: refs/heads/master i: 285735: 96976a79a741503e452cc7c8ae8851de8a6a8043 v: v3 --- [refs] | 2 +- trunk/drivers/media/video/s5p-fimc/fimc-core.c | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index b00b11ace720..2414c66da5c7 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f1d99f39fbd0218b8f8f6548e5522cbc2124f949 +refs/heads/master: f664684a56deb7675363e2fa3f1e2a5eedbb3222 diff --git a/trunk/drivers/media/video/s5p-fimc/fimc-core.c b/trunk/drivers/media/video/s5p-fimc/fimc-core.c index 4aaaf1de3a17..f5cbb8a4c540 100644 --- a/trunk/drivers/media/video/s5p-fimc/fimc-core.c +++ b/trunk/drivers/media/video/s5p-fimc/fimc-core.c @@ -1784,9 +1784,8 @@ static int fimc_runtime_resume(struct device *dev) /* Resume the capture or mem-to-mem device */ if (fimc_capture_busy(fimc)) return fimc_capture_resume(fimc); - else if (fimc_m2m_pending(fimc)) - return fimc_m2m_resume(fimc); - return 0; + + return fimc_m2m_resume(fimc); } static int fimc_runtime_suspend(struct device *dev)