From: Wei Yongjun <yongjun_wei@trendmicro.com.cn>
Date: Thu, 18 Apr 2013 02:18:19 +0000 (-0300)
Subject: [media] s5p-mfc: fix error return code in s5p_mfc_probe()
X-Git-Tag: v3.10-rc1~159^2^2~35
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=d68b44e088caf0176cf80e7539750569d6e71ed8;p=karo-tx-linux.git

[media] s5p-mfc: fix error return code in s5p_mfc_probe()

Fix to return a negative error code from the error handling
case instead of 0, as returned elsewhere in this function.

Signed-off-by: Wei Yongjun <yongjun_wei@trendmicro.com.cn>
Acked-by: Kamil Debski <k.debski@samsung.com>
Signed-off-by: Sylwester Nawrocki <s.nawrocki@samsung.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
---

diff --git a/drivers/media/platform/s5p-mfc/s5p_mfc.c b/drivers/media/platform/s5p-mfc/s5p_mfc.c
index e810b1abf40e..a5853fa59531 100644
--- a/drivers/media/platform/s5p-mfc/s5p_mfc.c
+++ b/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,