tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

V4L/DVB (11675): ivtv/radio: fix V4L2_TUNER_MODE/V4L2_TUNER_SUB confusion

V4L2_TUNER_MODE_ was used in a few places where V4L2_TUNER_SUB_ should have
been used.

Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>

authored by

Hans Verkuil and committed by
Mauro Carvalho Chehab dc47b778 ec105a42

+4 -4
+1 -1
drivers/media/radio/radio-sf16fmi.c
··· 153 153 mult = (fmi->flags & V4L2_TUNER_CAP_LOW) ? 1 : 1000; 154 154 v->rangelow = RSF16_MINFREQ / mult; 155 155 v->rangehigh = RSF16_MAXFREQ / mult; 156 - v->rxsubchans = V4L2_TUNER_SUB_MONO | V4L2_TUNER_MODE_STEREO; 156 + v->rxsubchans = V4L2_TUNER_SUB_MONO | V4L2_TUNER_SUB_STEREO; 157 157 v->capability = fmi->flags & V4L2_TUNER_CAP_LOW; 158 158 v->audmode = V4L2_TUNER_MODE_STEREO; 159 159 v->signal = fmi_getsigstr(fmi);
+1 -1
drivers/media/radio/radio-sf16fmr2.c
··· 233 233 mult = (fmr2->flags & V4L2_TUNER_CAP_LOW) ? 1 : 1000; 234 234 v->rangelow = RSF16_MINFREQ / mult; 235 235 v->rangehigh = RSF16_MAXFREQ / mult; 236 - v->rxsubchans = V4L2_TUNER_SUB_MONO | V4L2_TUNER_MODE_STEREO; 236 + v->rxsubchans = V4L2_TUNER_SUB_MONO | V4L2_TUNER_SUB_STEREO; 237 237 v->capability = fmr2->flags&V4L2_TUNER_CAP_LOW; 238 238 v->audmode = fmr2->stereo ? V4L2_TUNER_MODE_STEREO: 239 239 V4L2_TUNER_MODE_MONO;
+2 -2
drivers/media/video/ivtv/ivtv-gpio.c
··· 190 190 191 191 mask = itv->card->gpio_audio_detect.mask; 192 192 if (mask == 0 || (read_reg(IVTV_REG_GPIO_IN) & mask)) 193 - vt->rxsubchans = V4L2_TUNER_MODE_STEREO | 194 - V4L2_TUNER_MODE_LANG1 | V4L2_TUNER_MODE_LANG2; 193 + vt->rxsubchans = V4L2_TUNER_SUB_STEREO | 194 + V4L2_TUNER_SUB_LANG1 | V4L2_TUNER_SUB_LANG2; 195 195 else 196 196 vt->rxsubchans = V4L2_TUNER_SUB_MONO; 197 197 return 0;