summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@osg.samsung.com>2015-08-20 06:53:10 -0300
committerMauro Carvalho Chehab <mchehab@osg.samsung.com>2015-08-28 16:17:41 -0300
commit9c15799622c9b026688cca2046d728f3696717b4 (patch)
tree206817d0b5eb016e4aef8f9b95d74987fac90fd5
parent7fecb235cb4084509a6dfc2306d31d0923dcaf8d (diff)
downloadlwn-old/cs_9c15799622c9.tar.gz
lwn-old/cs_9c15799622c9.zip
[media] au0828: Fix the logic that enables the analog demoder linkold/cs_9c15799622c9
This logic was broken on the original patch, likely due to a cut-and-paste mistake. Fix it. Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
-rw-r--r--drivers/media/usb/au0828/au0828-video.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/media/usb/au0828/au0828-video.c b/drivers/media/usb/au0828/au0828-video.c
index f2a418f81531..2c040056d4eb 100644
--- a/drivers/media/usb/au0828/au0828-video.c
+++ b/drivers/media/usb/au0828/au0828-video.c
@@ -641,7 +641,7 @@ static int au0828_enable_analog_tuner(struct au0828_dev *dev)
{
#ifdef CONFIG_MEDIA_CONTROLLER
struct media_device *mdev = dev->media_dev;
- struct media_entity *entity, *source;
+ struct media_entity *source;
struct media_link *link, *found_link = NULL;
int i, ret, active_links = 0;
@@ -676,7 +676,7 @@ static int au0828_enable_analog_tuner(struct au0828_dev *dev)
link = &source->links[i];
sink = link->sink->entity;
- if (sink == entity)
+ if (sink == dev->decoder)
flags = MEDIA_LNK_FL_ENABLED;
ret = media_entity_setup_link(link, flags);