summaryrefslogtreecommitdiffstats
path: root/drivers/media/usb/au0828/au0828-cards.c
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@osg.samsung.com>2016-03-11 20:02:14 +0100
committerMauro Carvalho Chehab <mchehab@osg.samsung.com>2016-03-31 19:50:38 +0200
commit2e208c64e3aa7abe7b79963bb29f5d14a4b96e58 (patch)
tree314387e26c8082356f23d1d8152918a596ed6b2f /drivers/media/usb/au0828/au0828-cards.c
parentLinux 4.6-rc1 (diff)
downloadlinux-2e208c64e3aa7abe7b79963bb29f5d14a4b96e58.tar.xz
linux-2e208c64e3aa7abe7b79963bb29f5d14a4b96e58.zip
[media] au0828: disable tuner links and cache tuner/decoder
For au0828_enable_source() to work, the tuner links should be disabled and the tuner/decoder should be cached at au0828 struct. While here, put dev->decoder cache together with dev->tuner, as it makes easier to drop both latter if/when we move the enable routines to the V4L2 core. Fixes: 9822f4173f84 ('[media] au0828: use v4l2_mc_create_media_graph()') Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com> Reviewed-by: Shuah Khan <shuahkh@osg.samsung.com> Tested-by: Shuah Khan <shuahkh@osg.samsung.com>
Diffstat (limited to 'drivers/media/usb/au0828/au0828-cards.c')
-rw-r--r--drivers/media/usb/au0828/au0828-cards.c4
1 files changed, 0 insertions, 4 deletions
diff --git a/drivers/media/usb/au0828/au0828-cards.c b/drivers/media/usb/au0828/au0828-cards.c
index ca861aea68a5..6b469e8c4c6e 100644
--- a/drivers/media/usb/au0828/au0828-cards.c
+++ b/drivers/media/usb/au0828/au0828-cards.c
@@ -228,10 +228,6 @@ void au0828_card_analog_fe_setup(struct au0828_dev *dev)
"au8522", 0x8e >> 1, NULL);
if (sd == NULL)
pr_err("analog subdev registration failed\n");
-#ifdef CONFIG_MEDIA_CONTROLLER
- if (sd)
- dev->decoder = &sd->entity;
-#endif
}
/* Setup tuners */