From 3ca228930bab86b71fe174a9f0302b289c2185b0 Mon Sep 17 00:00:00 2001 From: Ondrej Jirman Date: Tue, 28 Jan 2020 17:36:52 +0100 Subject: [PATCH 047/351] media: sun6i-csi: Disable control handler in the csi driver This somehow makes controls on subdev0 appear on subdev1 that has no controls. Weird. Removing this code fixes the issue. Signed-off-by: Ondrej Jirman --- drivers/media/platform/sunxi/sun6i-csi/sun6i_csi.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/drivers/media/platform/sunxi/sun6i-csi/sun6i_csi.c b/drivers/media/platform/sunxi/sun6i-csi/sun6i_csi.c index 81653cffd798..39ccdc0cc138 100644 --- a/drivers/media/platform/sunxi/sun6i-csi/sun6i_csi.c +++ b/drivers/media/platform/sunxi/sun6i-csi/sun6i_csi.c @@ -761,15 +761,16 @@ static int sun6i_csi_v4l2_init(struct sun6i_csi *csi) media_device_init(&csi->media_dev); v4l2_async_notifier_init(&csi->notifier); + /* ret = v4l2_ctrl_handler_init(&csi->ctrl_handler, 0); if (ret) { dev_err(csi->dev, "V4L2 controls handler init failed (%d)\n", ret); goto clean_media; } - + */ csi->v4l2_dev.mdev = &csi->media_dev; - csi->v4l2_dev.ctrl_handler = &csi->ctrl_handler; + //csi->v4l2_dev.ctrl_handler = &csi->ctrl_handler; ret = v4l2_device_register(csi->dev, &csi->v4l2_dev); if (ret) { dev_err(csi->dev, "V4L2 device registration failed (%d)\n", @@ -803,7 +804,7 @@ static int sun6i_csi_v4l2_init(struct sun6i_csi *csi) unreg_v4l2: v4l2_device_unregister(&csi->v4l2_dev); free_ctrl: - v4l2_ctrl_handler_free(&csi->ctrl_handler); + //v4l2_ctrl_handler_free(&csi->ctrl_handler); clean_media: v4l2_async_notifier_cleanup(&csi->notifier); media_device_cleanup(&csi->media_dev); -- 2.34.0