diff options
author | Wei Yongjun <yongjun_wei@trendmicro.com.cn> | 2013-04-17 22:18:19 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2013-04-25 08:37:24 -0400 |
commit | d68b44e088caf0176cf80e7539750569d6e71ed8 (patch) | |
tree | a1247e8ddf44b604b9ed7520b898b51f5548f3c8 /drivers/media/platform/s5p-mfc | |
parent | b34f51fad396484e2bc102dcf95807b9990c3265 (diff) |
[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>
Diffstat (limited to 'drivers/media/platform/s5p-mfc')
-rw-r--r-- | drivers/media/platform/s5p-mfc/s5p_mfc.c | 3 |
1 files changed, 2 insertions, 1 deletions
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) | |||
1110 | } | 1110 | } |
1111 | 1111 | ||
1112 | if (pdev->dev.of_node) { | 1112 | if (pdev->dev.of_node) { |
1113 | if (s5p_mfc_alloc_memdevs(dev) < 0) | 1113 | ret = s5p_mfc_alloc_memdevs(dev); |
1114 | if (ret < 0) | ||
1114 | goto err_res; | 1115 | goto err_res; |
1115 | } else { | 1116 | } else { |
1116 | dev->mem_dev_l = device_find_child(&dev->plat_dev->dev, | 1117 | dev->mem_dev_l = device_find_child(&dev->plat_dev->dev, |