UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

[media] media: au0828 disable tuner to demod link 

Change au0828_create_media_graph() to find and disable
tuner and demod link. This helps avoid an additional
disable step when tuner is requested by video or audio.

Signed-off-by: Shuah Khan <shuahkh@osg.samsung.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
This commit is contained in:
Shuah Khan 2016-02-11 21:41:33 -02:00 committed by Mauro Carvalho Chehab
parent 2926d7f445
commit b176965176
1 changed files with 19 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
drivers/media/usb/au0828/au0828-video.c
View File

@ -657,7 +657,7 @@ static int au0828_create_media_graph(struct au0828_dev *dev)
#ifdef CONFIG_MEDIA_CONTROLLER #ifdef CONFIG_MEDIA_CONTROLLER
struct media_device *mdev = dev->media_dev; struct media_device *mdev = dev->media_dev;
struct media_entity *entity; struct media_entity *entity;
struct media_entity *tuner = NULL, *decoder = NULL; struct media_entity *tuner = NULL, *decoder = NULL, *demod = NULL;
int i, ret; int i, ret;
if (!mdev) if (!mdev)
@ -671,6 +671,9 @@ static int au0828_create_media_graph(struct au0828_dev *dev)
case MEDIA_ENT_F_ATV_DECODER: case MEDIA_ENT_F_ATV_DECODER:
decoder = entity; decoder = entity;
break; break;
case MEDIA_ENT_F_DTV_DEMOD:
demod = entity;
break;
} }
} }
@ -725,6 +728,21 @@ static int au0828_create_media_graph(struct au0828_dev *dev)
break; break;
} }
} }
/*
* Disable tuner to demod link to avoid disable step
* when tuner is requested by video or audio
*/
if (tuner && demod) {
struct media_link *link;
list_for_each_entry(link, &demod->links, list) {
if (link->sink->entity == demod &&
link->source->entity == tuner) {
media_entity_setup_link(link, 0);
}
}
}
#endif #endif
return 0; return 0;
} }