media: atmel: atmel-isc: fix and cleanup potential bugs

Fixed issues that can lead to potential bugs.
Cleanup order in the driver
Taking into consideration std control creation can fail
mutex_destroy call
changing controller_formats with const specifier
some cosmetic cleanups

Signed-off-by: Eugen Hristev <eugen.hristev@microchip.com>
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>

diff --git a/drivers/media/platform/atmel/atmel-isc-base.c b/drivers/media/platform/atmel/atmel-isc-base.c
index edfd7e00a56564b395fd7e93f71ff861a7e6cd32..eb1f5d4c207ee0a115217a2f471108d58fb96dca 100644 (file)
--- a/drivers/media/platform/atmel/atmel-isc-base.c
+++ b/drivers/media/platform/atmel/atmel-isc-base.c
@@ -45,7 +45,7 @@ MODULE_PARM_DESC(sensor_preferred,
                 "Sensor is preferred to output the specified format (1-on 0-off), default 1");
 
 /* This is a list of the formats that the ISC can *output* */
-struct isc_format controller_formats[] = {
+const struct isc_format controller_formats[] = {
        {
                .fourcc         = V4L2_PIX_FMT_ARGB444,
        },
@@ -231,7 +231,7 @@ static inline void isc_update_awb_ctrls(struct isc_device *isc)
 
 static inline void isc_reset_awb_ctrls(struct isc_device *isc)
 {
-       int c;
+       unsigned int c;
 
        for (c = ISC_HIS_CFG_MODE_GR; c <= ISC_HIS_CFG_MODE_B; c++) {
                /* gains have a fixed point at 9 decimals */
@@ -1456,7 +1456,7 @@ static int isc_enum_frameintervals(struct file *file, void *fh,
                .which = V4L2_SUBDEV_FORMAT_ACTIVE,
        };
        int ret = -EINVAL;
-       int i;
+       unsigned int i;
 
        for (i = 0; i < isc->num_user_formats; i++)
                if (isc->user_formats[i]->fourcc == fival->pixel_format)
@@ -1883,6 +1883,12 @@ static int isc_ctrl_init(struct isc_device *isc)
        isc->do_wb_ctrl = v4l2_ctrl_new_std(hdl, ops, V4L2_CID_DO_WHITE_BALANCE,
                                            0, 0, 0, 0);
 
+       if (!isc->do_wb_ctrl) {
+               ret = hdl->error;
+               v4l2_ctrl_handler_free(hdl);
+               return ret;
+       }
+
        v4l2_ctrl_activate(isc->do_wb_ctrl, false);
 
        v4l2_ctrl_handler_setup(hdl);
@@ -2010,7 +2016,7 @@ static int isc_async_complete(struct v4l2_async_notifier *notifier)
                                              struct isc_device, v4l2_dev);
        struct video_device *vdev = &isc->video_dev;
        struct vb2_queue *q = &isc->vb2_vidq;
-       int ret;
+       int ret = 0;
 
        INIT_WORK(&isc->awb_work, isc_awb_work);
 
@@ -2041,7 +2047,7 @@ static int isc_async_complete(struct v4l2_async_notifier *notifier)
        if (ret < 0) {
                v4l2_err(&isc->v4l2_dev,
                         "vb2_queue_init() failed: %d\n", ret);
-               return ret;
+               goto isc_async_complete_err;
        }
 
        /* Init video dma queues */
@@ -2053,19 +2059,19 @@ static int isc_async_complete(struct v4l2_async_notifier *notifier)
        if (ret < 0) {
                v4l2_err(&isc->v4l2_dev,
                         "Init format failed: %d\n", ret);
-               return ret;
+               goto isc_async_complete_err;
        }
 
        ret = isc_set_default_fmt(isc);
        if (ret) {
                v4l2_err(&isc->v4l2_dev, "Could not set default format\n");
-               return ret;
+               goto isc_async_complete_err;
        }
 
        ret = isc_ctrl_init(isc);
        if (ret) {
                v4l2_err(&isc->v4l2_dev, "Init isc ctrols failed: %d\n", ret);
-               return ret;
+               goto isc_async_complete_err;
        }
 
        /* Register video device */
@@ -2085,10 +2091,14 @@ static int isc_async_complete(struct v4l2_async_notifier *notifier)
        if (ret < 0) {
                v4l2_err(&isc->v4l2_dev,
                         "video_register_device failed: %d\n", ret);
-               return ret;
+               goto isc_async_complete_err;
        }
 
        return 0;
+
+isc_async_complete_err:
+       mutex_destroy(&isc->lock);
+       return ret;
 }
 
 const struct v4l2_async_notifier_operations isc_async_ops = {

diff --git a/drivers/media/platform/atmel/atmel-isc.h b/drivers/media/platform/atmel/atmel-isc.h
index 5be5b093aefbb70887bfb504c791bf3adf51daaf..f5f5932ac1e28242414d1999c30b8a4bd4bf6e96 100644 (file)
--- a/drivers/media/platform/atmel/atmel-isc.h
+++ b/drivers/media/platform/atmel/atmel-isc.h
@@ -235,7 +235,7 @@ extern unsigned int debug;
 extern unsigned int sensor_preferred;
 
 extern struct isc_format formats_list[];
-extern struct isc_format controller_formats[];
+extern const struct isc_format controller_formats[];
 extern const u32 isc_gamma_table[GAMMA_MAX + 1][GAMMA_ENTRIES];
 extern const struct regmap_config isc_regmap_config;
 extern const struct v4l2_async_notifier_operations isc_async_ops;

diff --git a/drivers/media/platform/atmel/atmel-sama5d2-isc.c b/drivers/media/platform/atmel/atmel-sama5d2-isc.c
index 127e79c8f84ae73d15b50ee321124ba7ea5fed50..266df14da2d5ee4dcc6a8fd0111382ed16cc036a 100644 (file)
--- a/drivers/media/platform/atmel/atmel-sama5d2-isc.c
+++ b/drivers/media/platform/atmel/atmel-sama5d2-isc.c
@@ -122,8 +122,7 @@ static int isc_parse_dt(struct device *dev, struct isc_device *isc)
                                        ISC_PFE_CFG0_CCIR656;
 
                subdev_entity->asd->match_type = V4L2_ASYNC_MATCH_FWNODE;
-               subdev_entity->asd->match.fwnode =
-                       of_fwnode_handle(rem);
+               subdev_entity->asd->match.fwnode = of_fwnode_handle(rem);
                list_add_tail(&subdev_entity->list, &isc->subdev_entities);
        }
 
@@ -282,13 +281,14 @@ static int atmel_isc_remove(struct platform_device *pdev)
        struct isc_device *isc = platform_get_drvdata(pdev);
 
        pm_runtime_disable(&pdev->dev);
-       clk_disable_unprepare(isc->ispck);
-       clk_disable_unprepare(isc->hclock);
 
        isc_subdev_cleanup(isc);
 
        v4l2_device_unregister(&isc->v4l2_dev);
 
+       clk_disable_unprepare(isc->ispck);
+       clk_disable_unprepare(isc->hclock);
+
        isc_clk_cleanup(isc);
 
        return 0;
@@ -313,7 +313,11 @@ static int __maybe_unused isc_runtime_resume(struct device *dev)
        if (ret)
                return ret;
 
-       return clk_prepare_enable(isc->ispck);
+       ret = clk_prepare_enable(isc->ispck);
+       if (ret)
+               clk_disable_unprepare(isc->hclock);
+
+       return ret;
 }
 
 static const struct dev_pm_ops atmel_isc_dev_pm_ops = {