aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/drivers/staging/media/imx/imx-media-csi.c
diff options
context:
space:
mode:
authorSteve Longerbeam <slongerbeam@gmail.com>2019-05-10 17:50:04 -0400
committerMauro Carvalho Chehab <mchehab+samsung@kernel.org>2019-05-28 13:55:10 -0400
commit411c59881c776cfc6a5d4c72fa7675dfd5674818 (patch)
tree2e98791c769d7146523327486213a3cbb38feec2 /drivers/staging/media/imx/imx-media-csi.c
parentmedia: v4l2-pci-skeleton.c: fix doc warning (diff)
downloadwireguard-linux-411c59881c776cfc6a5d4c72fa7675dfd5674818.tar.xz
wireguard-linux-411c59881c776cfc6a5d4c72fa7675dfd5674818.zip
media: Revert "media: staging/imx: add media device to capture register"
The imx6-specific subdevs that register a capture device will no longer hold a reference to the media device, so this commit must be reverted. This reverts commit 16204b8a1c1af77725533b77936e6c73953486ae. Signed-off-by: Steve Longerbeam <slongerbeam@gmail.com> Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl> Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>
Diffstat (limited to 'drivers/staging/media/imx/imx-media-csi.c')
-rw-r--r--drivers/staging/media/imx/imx-media-csi.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/staging/media/imx/imx-media-csi.c b/drivers/staging/media/imx/imx-media-csi.c
index 1d248aca40a9..28fe66052cc7 100644
--- a/drivers/staging/media/imx/imx-media-csi.c
+++ b/drivers/staging/media/imx/imx-media-csi.c
@@ -1812,7 +1812,7 @@ static int csi_registered(struct v4l2_subdev *sd)
if (ret)
goto free_fim;
- ret = imx_media_capture_device_register(priv->md, priv->vdev);
+ ret = imx_media_capture_device_register(priv->vdev);
if (ret)
goto free_fim;