12 files changed, 36 insertions, 45 deletions

diff --git a/drivers/media/i2c/mt9v111.c b/drivers/media/i2c/mt9v111.c
index b5410aeb5fe2..bb41bea950ac 100644
--- a/drivers/media/i2c/mt9v111.c
+++ b/drivers/media/i2c/mt9v111.c
@@ -1159,41 +1159,21 @@ static int mt9v111_probe(struct i2c_client *client)
                                               V4L2_CID_AUTO_WHITE_BALANCE,
                                               0, 1, 1,
                                               V4L2_WHITE_BALANCE_AUTO);
-        if (IS_ERR_OR_NULL(mt9v111->auto_awb)) {
-                ret = PTR_ERR(mt9v111->auto_awb);
-                goto error_free_ctrls;
-        }
-
         mt9v111->auto_exp = v4l2_ctrl_new_std_menu(&mt9v111->ctrls,
                                                    &mt9v111_ctrl_ops,
                                                    V4L2_CID_EXPOSURE_AUTO,
                                                    V4L2_EXPOSURE_MANUAL,
                                                    0, V4L2_EXPOSURE_AUTO);
-        if (IS_ERR_OR_NULL(mt9v111->auto_exp)) {
-                ret = PTR_ERR(mt9v111->auto_exp);
-                goto error_free_ctrls;
-        }
-
-        /* Initialize timings */
         mt9v111->hblank = v4l2_ctrl_new_std(&mt9v111->ctrls, &mt9v111_ctrl_ops,
                                             V4L2_CID_HBLANK,
                                             MT9V111_CORE_R05_MIN_HBLANK,
                                             MT9V111_CORE_R05_MAX_HBLANK, 1,
                                             MT9V111_CORE_R05_DEF_HBLANK);
-        if (IS_ERR_OR_NULL(mt9v111->hblank)) {
-                ret = PTR_ERR(mt9v111->hblank);
-                goto error_free_ctrls;
-        }
-
         mt9v111->vblank = v4l2_ctrl_new_std(&mt9v111->ctrls, &mt9v111_ctrl_ops,
                                             V4L2_CID_VBLANK,
                                             MT9V111_CORE_R06_MIN_VBLANK,
                                             MT9V111_CORE_R06_MAX_VBLANK, 1,
                                             MT9V111_CORE_R06_DEF_VBLANK);
-        if (IS_ERR_OR_NULL(mt9v111->vblank)) {
-                ret = PTR_ERR(mt9v111->vblank);
-                goto error_free_ctrls;
-        }
 
         /* PIXEL_RATE is fixed: just expose it to user space. */
         v4l2_ctrl_new_std(&mt9v111->ctrls, &mt9v111_ctrl_ops,
@@ -1201,6 +1181,10 @@ static int mt9v111_probe(struct i2c_client *client)
                           DIV_ROUND_CLOSEST(mt9v111->sysclk, 2), 1,
                           DIV_ROUND_CLOSEST(mt9v111->sysclk, 2));
 
+        if (mt9v111->ctrls.error) {
+                ret = mt9v111->ctrls.error;
+                goto error_free_ctrls;
+        }
         mt9v111->sd.ctrl_handler = &mt9v111->ctrls;
 
         /* Start with default configuration: 640x480 UYVY. */
@@ -1226,26 +1210,27 @@ static int mt9v111_probe(struct i2c_client *client)
         mt9v111->pad.flags      = MEDIA_PAD_FL_SOURCE;
         ret = media_entity_pads_init(&mt9v111->sd.entity, 1, &mt9v111->pad);
         if (ret)
-                goto error_free_ctrls;
+                goto error_free_entity;
 #endif
 
         ret = mt9v111_chip_probe(mt9v111);
         if (ret)
-                goto error_free_ctrls;
+                goto error_free_entity;
 
         ret = v4l2_async_register_subdev(&mt9v111->sd);
         if (ret)
-                goto error_free_ctrls;
+                goto error_free_entity;
 
         return 0;
 
-error_free_ctrls:
-        v4l2_ctrl_handler_free(&mt9v111->ctrls);
-
+error_free_entity:
 #if IS_ENABLED(CONFIG_MEDIA_CONTROLLER)
         media_entity_cleanup(&mt9v111->sd.entity);
 #endif
 
+error_free_ctrls:
+        v4l2_ctrl_handler_free(&mt9v111->ctrls);
+
         mutex_destroy(&mt9v111->pwr_mutex);
         mutex_destroy(&mt9v111->stream_mutex);
 
@@ -1259,12 +1244,12 @@ static int mt9v111_remove(struct i2c_client *client)
 
         v4l2_async_unregister_subdev(sd);
 
-        v4l2_ctrl_handler_free(&mt9v111->ctrls);
-
 #if IS_ENABLED(CONFIG_MEDIA_CONTROLLER)
         media_entity_cleanup(&sd->entity);
 #endif
 
+        v4l2_ctrl_handler_free(&mt9v111->ctrls);
+
         mutex_destroy(&mt9v111->pwr_mutex);
         mutex_destroy(&mt9v111->stream_mutex);
 
diff --git a/drivers/media/platform/Kconfig b/drivers/media/platform/Kconfig
index 94c1fe0e9787..54fe90acb5b2 100644
--- a/drivers/media/platform/Kconfig
+++ b/drivers/media/platform/Kconfig
@@ -541,6 +541,8 @@ config VIDEO_CROS_EC_CEC
         depends on MFD_CROS_EC
         select CEC_CORE
         select CEC_NOTIFIER
+        select CHROME_PLATFORMS
+        select CROS_EC_PROTO
         ---help---
           If you say yes here you will get support for the
           ChromeOS Embedded Controller's CEC.
diff --git a/drivers/media/platform/qcom/camss/camss-csid.c b/drivers/media/platform/qcom/camss/camss-csid.c
index 729b31891466..a5ae85674ffb 100644
--- a/drivers/media/platform/qcom/camss/camss-csid.c
+++ b/drivers/media/platform/qcom/camss/camss-csid.c
@@ -10,6 +10,7 @@
 #include <linux/clk.h>
 #include <linux/completion.h>
 #include <linux/interrupt.h>
+#include <linux/io.h>
 #include <linux/kernel.h>
 #include <linux/of.h>
 #include <linux/platform_device.h>
diff --git a/drivers/media/platform/qcom/camss/camss-csiphy-2ph-1-0.c b/drivers/media/platform/qcom/camss/camss-csiphy-2ph-1-0.c
index c832539397d7..12bce391d71f 100644
--- a/drivers/media/platform/qcom/camss/camss-csiphy-2ph-1-0.c
+++ b/drivers/media/platform/qcom/camss/camss-csiphy-2ph-1-0.c
@@ -12,6 +12,7 @@
 
 #include <linux/delay.h>
 #include <linux/interrupt.h>
+#include <linux/io.h>
 
 #define CAMSS_CSI_PHY_LNn_CFG2(n)               (0x004 + 0x40 * (n))
 #define CAMSS_CSI_PHY_LNn_CFG3(n)               (0x008 + 0x40 * (n))
diff --git a/drivers/media/platform/qcom/camss/camss-csiphy-3ph-1-0.c b/drivers/media/platform/qcom/camss/camss-csiphy-3ph-1-0.c
index bcd0dfd33618..2e65caf1ecae 100644
--- a/drivers/media/platform/qcom/camss/camss-csiphy-3ph-1-0.c
+++ b/drivers/media/platform/qcom/camss/camss-csiphy-3ph-1-0.c
@@ -12,6 +12,7 @@
 
 #include <linux/delay.h>
 #include <linux/interrupt.h>
+#include <linux/io.h>
 
 #define CSIPHY_3PH_LNn_CFG1(n)                  (0x000 + 0x100 * (n))
 #define CSIPHY_3PH_LNn_CFG1_SWI_REC_DLY_PRG     (BIT(7) | BIT(6))
diff --git a/drivers/media/platform/qcom/camss/camss-csiphy.c b/drivers/media/platform/qcom/camss/camss-csiphy.c
index 4559f3b1b38c..008afb85023b 100644
--- a/drivers/media/platform/qcom/camss/camss-csiphy.c
+++ b/drivers/media/platform/qcom/camss/camss-csiphy.c
@@ -10,6 +10,7 @@
 #include <linux/clk.h>
 #include <linux/delay.h>
 #include <linux/interrupt.h>
+#include <linux/io.h>
 #include <linux/kernel.h>
 #include <linux/of.h>
 #include <linux/platform_device.h>
diff --git a/drivers/media/platform/qcom/camss/camss-ispif.c b/drivers/media/platform/qcom/camss/camss-ispif.c
index 7f269021d08c..1f33b4eb198c 100644
--- a/drivers/media/platform/qcom/camss/camss-ispif.c
+++ b/drivers/media/platform/qcom/camss/camss-ispif.c
@@ -10,6 +10,7 @@
 #include <linux/clk.h>
 #include <linux/completion.h>
 #include <linux/interrupt.h>
+#include <linux/io.h>
 #include <linux/iopoll.h>
 #include <linux/kernel.h>
 #include <linux/mutex.h>
@@ -1076,8 +1077,8 @@ int msm_ispif_subdev_init(struct ispif_device *ispif,
         else
                 return -EINVAL;
 
-        ispif->line = kcalloc(ispif->line_num, sizeof(*ispif->line),
-                              GFP_KERNEL);
+        ispif->line = devm_kcalloc(dev, ispif->line_num, sizeof(*ispif->line),
+                                   GFP_KERNEL);
         if (!ispif->line)
                 return -ENOMEM;
 
diff --git a/drivers/media/platform/qcom/camss/camss-vfe-4-1.c b/drivers/media/platform/qcom/camss/camss-vfe-4-1.c
index da3a9fed9f2d..174a36be6f5d 100644
--- a/drivers/media/platform/qcom/camss/camss-vfe-4-1.c
+++ b/drivers/media/platform/qcom/camss/camss-vfe-4-1.c
@@ -9,6 +9,7 @@
  */
 
 #include <linux/interrupt.h>
+#include <linux/io.h>
 #include <linux/iopoll.h>
 
 #include "camss-vfe.h"
diff --git a/drivers/media/platform/qcom/camss/camss-vfe-4-7.c b/drivers/media/platform/qcom/camss/camss-vfe-4-7.c
index 4c584bffd179..0dca8bf9281e 100644
--- a/drivers/media/platform/qcom/camss/camss-vfe-4-7.c
+++ b/drivers/media/platform/qcom/camss/camss-vfe-4-7.c
@@ -9,6 +9,7 @@
  */
 
 #include <linux/interrupt.h>
+#include <linux/io.h>
 #include <linux/iopoll.h>
 
 #include "camss-vfe.h"
diff --git a/drivers/media/platform/qcom/camss/camss.c b/drivers/media/platform/qcom/camss/camss.c
index dcc0c30ef1b1..669615fff6a0 100644
--- a/drivers/media/platform/qcom/camss/camss.c
+++ b/drivers/media/platform/qcom/camss/camss.c
@@ -848,17 +848,18 @@ static int camss_probe(struct platform_device *pdev)
                 return -EINVAL;
         }
 
-        camss->csiphy = kcalloc(camss->csiphy_num, sizeof(*camss->csiphy),
-                                GFP_KERNEL);
+        camss->csiphy = devm_kcalloc(dev, camss->csiphy_num,
+                                     sizeof(*camss->csiphy), GFP_KERNEL);
         if (!camss->csiphy)
                 return -ENOMEM;
 
-        camss->csid = kcalloc(camss->csid_num, sizeof(*camss->csid),
-                              GFP_KERNEL);
+        camss->csid = devm_kcalloc(dev, camss->csid_num, sizeof(*camss->csid),
+                                   GFP_KERNEL);
         if (!camss->csid)
                 return -ENOMEM;
 
-        camss->vfe = kcalloc(camss->vfe_num, sizeof(*camss->vfe), GFP_KERNEL);
+        camss->vfe = devm_kcalloc(dev, camss->vfe_num, sizeof(*camss->vfe),
+                                  GFP_KERNEL);
         if (!camss->vfe)
                 return -ENOMEM;
 
@@ -993,12 +994,12 @@ static const struct of_device_id camss_dt_match[] = {
 
 MODULE_DEVICE_TABLE(of, camss_dt_match);
 
-static int camss_runtime_suspend(struct device *dev)
+static int __maybe_unused camss_runtime_suspend(struct device *dev)
 {
         return 0;
 }
 
-static int camss_runtime_resume(struct device *dev)
+static int __maybe_unused camss_runtime_resume(struct device *dev)
 {
         return 0;
 }
diff --git a/drivers/media/usb/dvb-usb-v2/af9035.c b/drivers/media/usb/dvb-usb-v2/af9035.c
index 666d319d3d1a..1f6c1eefe389 100644
--- a/drivers/media/usb/dvb-usb-v2/af9035.c
+++ b/drivers/media/usb/dvb-usb-v2/af9035.c
@@ -402,8 +402,10 @@ static int af9035_i2c_master_xfer(struct i2c_adapter *adap,
                         if (msg[0].addr == state->af9033_i2c_addr[1])
                                 reg |= 0x100000;
 
-                        ret = af9035_wr_regs(d, reg, &msg[0].buf[3],
-                                        msg[0].len - 3);
+                        ret = (msg[0].len >= 3) ? af9035_wr_regs(d, reg,
+                                                                 &msg[0].buf[3],
+                                                                 msg[0].len - 3)
+                                                : -EOPNOTSUPP;
                 } else {
                         /* I2C write */
                         u8 buf[MAX_XFER_SIZE];
diff --git a/drivers/staging/media/mt9t031/Kconfig b/drivers/staging/media/mt9t031/Kconfig
index f48e06a03cdb..9a58aaf72edd 100644
--- a/drivers/staging/media/mt9t031/Kconfig
+++ b/drivers/staging/media/mt9t031/Kconfig
@@ -1,9 +1,3 @@
-config SOC_CAMERA_IMX074
-        tristate "imx074 support (DEPRECATED)"
-        depends on SOC_CAMERA && I2C
-        help
-          This driver supports IMX074 cameras from Sony
-
 config SOC_CAMERA_MT9T031
         tristate "mt9t031 support (DEPRECATED)"
         depends on SOC_CAMERA && I2C