From 662aff17c94f3f8678c5e3fa2c9192e1127bad40 Mon Sep 17 00:00:00 2001
From: Wei Yongjun <yongjun_wei@trendmicro.com.cn>
Date: Wed, 17 Apr 2013 23:18:19 -0300
Subject: [PATCH] --- yaml --- r: 367101 b: refs/heads/master c:
 d68b44e088caf0176cf80e7539750569d6e71ed8 h: refs/heads/master i:   367099:
 eb1fc3e1a80bbc63a7f638a3ab6136f4eab253fb v: v3

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

diff --git a/[refs] b/[refs]
index 5c9012dc3025..dc3fd5ab7888 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b34f51fad396484e2bc102dcf95807b9990c3265
+refs/heads/master: d68b44e088caf0176cf80e7539750569d6e71ed8
diff --git a/trunk/drivers/media/platform/s5p-mfc/s5p_mfc.c b/trunk/drivers/media/platform/s5p-mfc/s5p_mfc.c
index e810b1abf40e..a5853fa59531 100644
--- a/trunk/drivers/media/platform/s5p-mfc/s5p_mfc.c
+++ b/trunk/drivers/media/platform/s5p-mfc/s5p_mfc.c
@@ -1110,7 +1110,8 @@ static int s5p_mfc_probe(struct platform_device *pdev)
 	}
 
 	if (pdev->dev.of_node) {
-		if (s5p_mfc_alloc_memdevs(dev) < 0)
+		ret = s5p_mfc_alloc_memdevs(dev);
+		if (ret < 0)
 			goto err_res;
 	} else {
 		dev->mem_dev_l = device_find_child(&dev->plat_dev->dev,