git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Revert to Fedora kernel-2.6.17-1.2187_FC5 patched with vs2.0.2.1; there are too many...
[linux-2.6.git]
/
sound
/
pci
/
ice1712
/
aureon.c
diff --git
a/sound/pci/ice1712/aureon.c
b/sound/pci/ice1712/aureon.c
index
9492f3d
..
336dc48
100644
(file)
--- a/
sound/pci/ice1712/aureon.c
+++ b/
sound/pci/ice1712/aureon.c
@@
-1281,15
+1281,9
@@
static int aureon_set_headphone_amp(struct snd_ice1712 *ice, int enable)
tmp2 = tmp = snd_ice1712_gpio_read(ice);
if (enable)
tmp2 = tmp = snd_ice1712_gpio_read(ice);
if (enable)
- if (ice->eeprom.subvendor != VT1724_SUBDEVICE_PRODIGY71LT)
- tmp |= AUREON_HP_SEL;
- else
- tmp |= PRODIGY_HP_SEL;
+ tmp |= AUREON_HP_SEL;
else
else
- if (ice->eeprom.subvendor != VT1724_SUBDEVICE_PRODIGY71LT)
- tmp &= ~ AUREON_HP_SEL;
- else
- tmp &= ~ PRODIGY_HP_SEL;
+ tmp &= ~ AUREON_HP_SEL;
if (tmp != tmp2) {
snd_ice1712_gpio_write(ice, tmp);
return 1;
if (tmp != tmp2) {
snd_ice1712_gpio_write(ice, tmp);
return 1;
@@
-2085,16
+2079,16
@@
static unsigned char prodigy71_eeprom[] __devinitdata = {
};
static unsigned char prodigy71lt_eeprom[] __devinitdata = {
};
static unsigned char prodigy71lt_eeprom[] __devinitdata = {
- 0x
4
b, /* SYSCINF: clock 512, spdif-in/ADC, 4DACs */
+ 0x
0
b, /* SYSCINF: clock 512, spdif-in/ADC, 4DACs */
0x80, /* ACLINK: I2S */
0xfc, /* I2S: vol, 96k, 24bit, 192k */
0x80, /* ACLINK: I2S */
0xfc, /* I2S: vol, 96k, 24bit, 192k */
- 0xc3, /* SPD
IF: out-en, out-int, spdif-in
*/
- 0x
ff
, /* GPIO_DIR */
- 0x
ff
, /* GPIO_DIR1 */
- 0x
5f
, /* GPIO_DIR2 */
- 0x
00
, /* GPIO_MASK */
- 0x
00
, /* GPIO_MASK1 */
- 0x
00
, /* GPIO_MASK2 */
+ 0xc3, /* SPD
UF: out-en, out-int
*/
+ 0x
00
, /* GPIO_DIR */
+ 0x
07
, /* GPIO_DIR1 */
+ 0x
00
, /* GPIO_DIR2 */
+ 0x
ff
, /* GPIO_MASK */
+ 0x
f8
, /* GPIO_MASK1 */
+ 0x
ff
, /* GPIO_MASK2 */
0x00, /* GPIO_STATE */
0x00, /* GPIO_STATE1 */
0x00, /* GPIO_STATE2 */
0x00, /* GPIO_STATE */
0x00, /* GPIO_STATE1 */
0x00, /* GPIO_STATE2 */
@@
-2131,7
+2125,7
@@
struct snd_ice1712_card_info snd_vt1724_aureon_cards[] __devinitdata = {
.build_controls = aureon_add_controls,
.eeprom_size = sizeof(aureon71_eeprom),
.eeprom_data = aureon71_eeprom,
.build_controls = aureon_add_controls,
.eeprom_size = sizeof(aureon71_eeprom),
.eeprom_data = aureon71_eeprom,
- .driver = "Aureon71Univ
", /* keep in 15 letters */
+ .driver = "Aureon71Univ
erse",
},
{
.subvendor = VT1724_SUBDEVICE_PRODIGY71,
},
{
.subvendor = VT1724_SUBDEVICE_PRODIGY71,