media: vimc: Fix return value check in vimc_add_subdevs()

In case of error, the function platform_device_register_data() returns
ERR_PTR() and never returns NULL. The NULL test in the return value check
should be replaced with IS_ERR().

Signed-off-by: Wei Yongjun <weiyongjun1@huawei.com>
Acked-by: Helen Koike <helen.koike@collabora.com>
Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>

1 files changed, 3 insertions, 2 deletions

diff --git a/drivers/media/platform/vimc/vimc-core.c b/drivers/media/platform/vimc/vimc-core.c
index 51c0eee61ca6..fe088a953860 100644
--- a/drivers/media/platform/vimc/vimc-core.c
+++ b/drivers/media/platform/vimc/vimc-core.c
@@ -267,11 +267,12 @@ static struct component_match *vimc_add_subdevs(struct vimc_device *vimc)
                                                 PLATFORM_DEVID_AUTO,
                                                 &pdata,
                                                 sizeof(pdata));
-                if (!vimc->subdevs[i]) {
+                if (IS_ERR(vimc->subdevs[i])) {
+                        match = ERR_CAST(vimc->subdevs[i]);
                         while (--i >= 0)
                                 platform_device_unregister(vimc->subdevs[i]);
 
-                        return ERR_PTR(-ENOMEM);
+                        return match;
                 }
 
                 component_match_add(&vimc->pdev.dev, &match, vimc_comp_compare,