1
0
Fork 0

media: vicodec: Fix error codes in probe function

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

Fixes: fde649b418 ("media: vicodec: Register another node for stateless decoder")
Fixes: c022a4a957 ("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>
alistair/sunxi64-5.8
Dan Carpenter 2020-04-07 11:32:37 +02:00 committed by Mauro Carvalho Chehab
parent d00c9761af
commit f36592e7b3
1 changed files with 9 additions and 6 deletions

View File

@ -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