media: vicodec: Fix error codes in probe function

[ Upstream commit f36592e7b343d853edf44d3545bb68961c0949a4 ]

If these functions fail then we return success, but we should instead
preserve negative error code and return that.

Fixes: fde649b418d1 ("media: vicodec: Register another node for stateless decoder")
Fixes: c022a4a95722 ("media: vicodec: add struct for encoder/decoder instance")
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/drivers/media/platform/vicodec/vicodec-core.c b/drivers/media/platform/vicodec/vicodec-core.c
index 30ced1c2138751dbfdf67295f942fb8d94efc490..e879290727ef449ca03e10940cd16b3feec42914 100644 (file)
--- a/drivers/media/platform/vicodec/vicodec-core.c
+++ b/drivers/media/platform/vicodec/vicodec-core.c
@@ -2114,16 +2114,19 @@ static int vicodec_probe(struct platform_device *pdev)
 
        platform_set_drvdata(pdev, dev);
 
-       if (register_instance(dev, &dev->stateful_enc,
-                             "stateful-encoder", true))
+       ret = register_instance(dev, &dev->stateful_enc, "stateful-encoder",
+                               true);
+       if (ret)
                goto unreg_dev;
 
-       if (register_instance(dev, &dev->stateful_dec,
-                             "stateful-decoder", false))
+       ret = register_instance(dev, &dev->stateful_dec, "stateful-decoder",
+                               false);
+       if (ret)
                goto unreg_sf_enc;
 
-       if (register_instance(dev, &dev->stateless_dec,
-                             "stateless-decoder", false))
+       ret = register_instance(dev, &dev->stateless_dec, "stateless-decoder",
+                               false);
+       if (ret)
                goto unreg_sf_dec;
 
 #ifdef CONFIG_MEDIA_CONTROLLER