If fimc->drv_data is NULL, then fimc->drv_data->num_entities would
cause NULL pointer dereferencing.
While at it also remove the check for fimc->id being negative as 'id' is
unsigned variable and can't be less than 0.

Signed-off-by: Sachin Kamat <sachin.ka...@linaro.org>
---
 drivers/media/platform/exynos4-is/fimc-core.c |    7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/drivers/media/platform/exynos4-is/fimc-core.c 
b/drivers/media/platform/exynos4-is/fimc-core.c
index f25807d..d388832 100644
--- a/drivers/media/platform/exynos4-is/fimc-core.c
+++ b/drivers/media/platform/exynos4-is/fimc-core.c
@@ -953,10 +953,9 @@ static int fimc_probe(struct platform_device *pdev)
                fimc->drv_data = fimc_get_drvdata(pdev);
                fimc->id = pdev->id;
        }
-       if (!fimc->drv_data || fimc->id >= fimc->drv_data->num_entities ||
-           fimc->id < 0) {
-               dev_err(dev, "Invalid driver data or device id (%d/%d)\n",
-                       fimc->id, fimc->drv_data->num_entities);
+       if (!fimc->drv_data || fimc->id >= fimc->drv_data->num_entities) {
+               dev_err(dev, "Invalid driver data or device id (%d)\n",
+                       fimc->id);
                return -EINVAL;
        }
        if (!dev->of_node)
-- 
1.7.9.5

--
To unsubscribe from this list: send the line "unsubscribe linux-media" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to