system/linux
system/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux synced 2024-10-23 03:37:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

[media] bttv: audio_mux(): do not change the value of the v4l2 mute control

Browse source 
There are cases where we want to call audio_mux() without changing the value of
the v4l2 mute control, for example
- mute mute on last close
- mute on device probing

Signed-off-by: Frank Schäfer <fschaefer.oss@googlemail.com>
Acked-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
This commit is contained in:
Frank Schaefer 2013-03-21 13:51:14 -03:00 committed by Mauro Carvalho Chehab
parent 28cafc38ec
commit 598728e920
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
drivers/media/pci/bt8xx/bttv-driver.c
View file

@ -999,7 +999,6 @@ audio_mux(struct bttv *btv, int input, int mute)
bttv_tvcards[btv->c.type].gpiomask);
signal = btread(BT848_DSTATUS) & BT848_DSTATUS_HLOC;
btv->mute = mute;
btv->audio = input;
/* automute */
@ -1031,7 +1030,7 @@ audio_mux(struct bttv *btv, int input, int mute)
ctrl = v4l2_ctrl_find(btv->sd_msp34xx->ctrl_handler, V4L2_CID_AUDIO_MUTE);
if (ctrl)
v4l2_ctrl_s_ctrl(ctrl, btv->mute);
v4l2_ctrl_s_ctrl(ctrl, mute);
/* Note: the inputs tuner/radio/extern/intern are translated
to msp routings. This assumes common behavior for all msp3400
@ -1080,7 +1079,7 @@ audio_mux(struct bttv *btv, int input, int mute)
ctrl = v4l2_ctrl_find(btv->sd_tvaudio->ctrl_handler, V4L2_CID_AUDIO_MUTE);
if (ctrl)
v4l2_ctrl_s_ctrl(ctrl, btv->mute);
v4l2_ctrl_s_ctrl(ctrl, mute);
v4l2_subdev_call(btv->sd_tvaudio, audio, s_routing,
input, 0, 0);
}
@ -1088,7 +1087,7 @@ audio_mux(struct bttv *btv, int input, int mute)
ctrl = v4l2_ctrl_find(btv->sd_tda7432->ctrl_handler, V4L2_CID_AUDIO_MUTE);
if (ctrl)
v4l2_ctrl_s_ctrl(ctrl, btv->mute);
v4l2_ctrl_s_ctrl(ctrl, mute);
}
return 0;
}
@ -1300,6 +1299,7 @@ static int bttv_s_ctrl(struct v4l2_ctrl *c)
break;
case V4L2_CID_AUDIO_MUTE:
audio_mute(btv, c->val);
btv->mute = c->val;
break;
case V4L2_CID_AUDIO_VOLUME:
btv->volume_gpio(btv, c->val);