aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/video/em28xx
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@redhat.com>2011-06-18 06:02:49 -0400
committerMauro Carvalho Chehab <mchehab@redhat.com>2011-07-27 16:53:03 -0400
commit0f8a61fc42a618e25c61549590c35c66c63e2ca7 (patch)
tree3217b6371faf57c34fadfe051142939658da68ee /drivers/media/video/em28xx
parent00d2e7ad9dd4e88224d091e454371d8a9a80719f (diff)
[media] em28xx: Fix a wrong enum at the ac97 control tables
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/video/em28xx')
-rw-r--r--drivers/media/video/em28xx/em28xx-core.c11
1 files changed, 8 insertions, 3 deletions
diff --git a/drivers/media/video/em28xx/em28xx-core.c b/drivers/media/video/em28xx/em28xx-core.c
index 55d0d9d1019f..7bf3a86902b0 100644
--- a/drivers/media/video/em28xx/em28xx-core.c
+++ b/drivers/media/video/em28xx/em28xx-core.c
@@ -314,12 +314,12 @@ int em28xx_write_ac97(struct em28xx *dev, u8 reg, u16 val)
314 return 0; 314 return 0;
315} 315}
316 316
317struct em28xx_vol_table { 317struct em28xx_vol_itable {
318 enum em28xx_amux mux; 318 enum em28xx_amux mux;
319 u8 reg; 319 u8 reg;
320}; 320};
321 321
322static struct em28xx_vol_table inputs[] = { 322static struct em28xx_vol_itable inputs[] = {
323 { EM28XX_AMUX_VIDEO, AC97_VIDEO_VOL }, 323 { EM28XX_AMUX_VIDEO, AC97_VIDEO_VOL },
324 { EM28XX_AMUX_LINE_IN, AC97_LINEIN_VOL }, 324 { EM28XX_AMUX_LINE_IN, AC97_LINEIN_VOL },
325 { EM28XX_AMUX_PHONE, AC97_PHONE_VOL }, 325 { EM28XX_AMUX_PHONE, AC97_PHONE_VOL },
@@ -403,7 +403,12 @@ static int em28xx_set_audio_source(struct em28xx *dev)
403 return ret; 403 return ret;
404} 404}
405 405
406static const struct em28xx_vol_table outputs[] = { 406struct em28xx_vol_otable {
407 enum em28xx_aout mux;
408 u8 reg;
409};
410
411static const struct em28xx_vol_otable outputs[] = {
407 { EM28XX_AOUT_MASTER, AC97_MASTER_VOL }, 412 { EM28XX_AOUT_MASTER, AC97_MASTER_VOL },
408 { EM28XX_AOUT_LINE, AC97_LINE_LEVEL_VOL }, 413 { EM28XX_AOUT_LINE, AC97_LINE_LEVEL_VOL },
409 { EM28XX_AOUT_MONO, AC97_MASTER_MONO_VOL }, 414 { EM28XX_AOUT_MONO, AC97_MASTER_MONO_VOL },