aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/media/platform/exynos-gsc/gsc-core.c8
1 files changed, 6 insertions, 2 deletions
diff --git a/drivers/media/platform/exynos-gsc/gsc-core.c b/drivers/media/platform/exynos-gsc/gsc-core.c
index c595723f5031..c04973669a47 100644
--- a/drivers/media/platform/exynos-gsc/gsc-core.c
+++ b/drivers/media/platform/exynos-gsc/gsc-core.c
@@ -1063,13 +1063,17 @@ static int gsc_probe(struct platform_device *pdev)
1063 struct resource *res; 1063 struct resource *res;
1064 struct gsc_driverdata *drv_data = gsc_get_drv_data(pdev); 1064 struct gsc_driverdata *drv_data = gsc_get_drv_data(pdev);
1065 struct device *dev = &pdev->dev; 1065 struct device *dev = &pdev->dev;
1066 int ret = 0; 1066 int ret;
1067 1067
1068 gsc = devm_kzalloc(dev, sizeof(struct gsc_dev), GFP_KERNEL); 1068 gsc = devm_kzalloc(dev, sizeof(struct gsc_dev), GFP_KERNEL);
1069 if (!gsc) 1069 if (!gsc)
1070 return -ENOMEM; 1070 return -ENOMEM;
1071 1071
1072 gsc->id = of_alias_get_id(pdev->dev.of_node, "gsc"); 1072 ret = of_alias_get_id(pdev->dev.of_node, "gsc");
1073 if (ret < 0)
1074 return ret;
1075
1076 gsc->id = ret;
1073 if (gsc->id >= drv_data->num_entities) { 1077 if (gsc->id >= drv_data->num_entities) {
1074 dev_err(dev, "Invalid platform device id: %d\n", gsc->id); 1078 dev_err(dev, "Invalid platform device id: %d\n", gsc->id);
1075 return -EINVAL; 1079 return -EINVAL;