The patch number 9643 was added via Mauro Carvalho Chehab <[EMAIL PROTECTED]>
to http://linuxtv.org/hg/v4l-dvb master development tree.
Kernel patches in this development tree may be modified to be backward
compatible with older kernels. Compatibility modifications will be
removed before inclusion into the mainstream Kernel
If anyone has any objections, please let us know by sending a message to:
[EMAIL PROTECTED]
------
From: Mauro Carvalho Chehab <[EMAIL PROTECTED]>
Remove the previous register names
Previously, AC97 registers were named as if they were part of em28xx
device, generating some confusion. Replace such names for a more general
naming convention.
Priority: normal
Signed-off-by: Mauro Carvalho Chehab <[EMAIL PROTECTED]>
---
linux/drivers/media/video/em28xx/em28xx-core.c | 8 ++++----
linux/drivers/media/video/em28xx/em28xx-reg.h | 5 -----
2 files changed, 4 insertions(+), 9 deletions(-)
diff -r f5876b63d047 -r c143ba630fb0
linux/drivers/media/video/em28xx/em28xx-core.c
--- a/linux/drivers/media/video/em28xx/em28xx-core.c Mon Nov 17 23:30:09
2008 -0200
+++ b/linux/drivers/media/video/em28xx/em28xx-core.c Mon Nov 17 23:40:36
2008 -0200
@@ -292,11 +292,11 @@ static int em28xx_set_audio_source(struc
/* Sets AC97 mixer registers
This is seems to be needed, even for non-ac97 configs
*/
- ret = em28xx_write_ac97(dev, EM28XX_R14_VIDEO_AC97, video);
+ ret = em28xx_write_ac97(dev, AC97_VIDEO_VOL, video);
if (ret < 0)
return ret;
- ret = em28xx_write_ac97(dev, EM28XX_R10_LINE_IN_AC97, line);
+ ret = em28xx_write_ac97(dev, AC97_LINEIN_VOL, line);
return ret;
}
@@ -312,7 +312,7 @@ int em28xx_audio_analog_set(struct em28x
/* Mute */
s[1] |= 0x80;
- ret = em28xx_write_ac97(dev, EM28XX_R02_MASTER_AC97, s);
+ ret = em28xx_write_ac97(dev, AC97_MASTER_VOL, s);
if (ret < 0)
return ret;
@@ -334,7 +334,7 @@ int em28xx_audio_analog_set(struct em28x
/* Unmute device */
if (!dev->mute)
s[1] &= ~0x80;
- ret = em28xx_write_ac97(dev, EM28XX_R02_MASTER_AC97, s);
+ ret = em28xx_write_ac97(dev, AC97_MASTER_VOL, s);
return ret;
}
diff -r f5876b63d047 -r c143ba630fb0
linux/drivers/media/video/em28xx/em28xx-reg.h
--- a/linux/drivers/media/video/em28xx/em28xx-reg.h Mon Nov 17 23:30:09
2008 -0200
+++ b/linux/drivers/media/video/em28xx/em28xx-reg.h Mon Nov 17 23:40:36
2008 -0200
@@ -77,11 +77,6 @@
0x46 IR brand
0x47 IR data
*/
-
-/* em202 registers */
-#define EM28XX_R02_MASTER_AC97 0x02
-#define EM28XX_R10_LINE_IN_AC97 0x10
-#define EM28XX_R14_VIDEO_AC97 0x14
/* em2874 registers */
#define EM2874_R50_IR_CONFIG 0x50
---
Patch is available at:
http://linuxtv.org/hg/v4l-dvb/rev/c143ba630fb08b6569df9eb78b805207fb2200cc
_______________________________________________
linuxtv-commits mailing list
linuxtv-commits@linuxtv.org
http://www.linuxtv.org/cgi-bin/mailman/listinfo/linuxtv-commits
