From 4331bd42d86da9784c2b0fe3327dbcea6977650c Mon Sep 17 00:00:00 2001
From: Kamil Debski <k.debski@samsung.com>
Date: Thu, 22 Nov 2012 10:00:28 -0300
Subject: [PATCH] --- yaml --- r: 357327 b: refs/heads/master c:
 1b73ba0be4aad87a0d195a6d433bb59ffe81e99a h: refs/heads/master i:   357325:
 e665cff9c203aaa731c2217bab949ec11a92df87   357323:
 fec8e23cb656301948dfe05b9670f71bc95be218   357319:
 928d56d9610a2079773aa0776edc4738e6b41c48   357311:
 80b3540871c84c2d9def05835587f62546fd0525 v: v3

---
 [refs]                                         | 2 +-
 trunk/drivers/media/platform/s5p-mfc/s5p_mfc.c | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index a85e967749b9..198710746edf 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 317b4ca4982ea2429b75d0acd10445ec9475aa86
+refs/heads/master: 1b73ba0be4aad87a0d195a6d433bb59ffe81e99a
diff --git a/trunk/drivers/media/platform/s5p-mfc/s5p_mfc.c b/trunk/drivers/media/platform/s5p-mfc/s5p_mfc.c
index 4fcd075e8699..b1d7f9a9b996 100644
--- a/trunk/drivers/media/platform/s5p-mfc/s5p_mfc.c
+++ b/trunk/drivers/media/platform/s5p-mfc/s5p_mfc.c
@@ -855,16 +855,16 @@ static int s5p_mfc_open(struct file *file)
 		s5p_mfc_deinit_hw(dev);
 err_init_hw:
 err_load_fw:
-	dev->ctx[ctx->num] = NULL;
-	del_timer_sync(&dev->watchdog_timer);
 err_pwr_enable:
 	if (dev->num_inst == 1) {
 		if (s5p_mfc_power_off() < 0)
 			mfc_err("power off failed\n");
+		del_timer_sync(&dev->watchdog_timer);
 	}
 err_ctrls_setup:
 	s5p_mfc_dec_ctrls_delete(ctx);
 err_bad_node:
+	dev->ctx[ctx->num] = NULL;
 err_no_ctx:
 	v4l2_fh_del(&ctx->fh);
 	v4l2_fh_exit(&ctx->fh);