Skip to content

L
linux
Commit 69d6e852 authored by Jaroslav Kysela's avatar Jaroslav Kysela Committed by Linus Torvalds
Browse files
Options

ALSA CVS update - Takashi Iwai <tiwai@suse.de> 

Intel8x0 driver
disable the legacy midi/joystick properly as default.
parent 8c83de26
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 0 deletions
sound/pci/intel8x0.c
View file @ 69d6e852
...@@ -2742,6 +2742,7 @@ static int __devinit snd_intel8x0_joystick_probe(struct pci_dev *pci, ...@@ -2742,6 +2742,7 @@ static int __devinit snd_intel8x0_joystick_probe(struct pci_dev *pci,
pci_read_config_word(pci, 0xe6, &val); pci_read_config_word(pci, 0xe6, &val);
#ifdef SUPPORT_JOYSTICK #ifdef SUPPORT_JOYSTICK
val &= ~0x100;
if (joystick[dev]) { if (joystick[dev]) {
if (! request_region(ich_gameport.io, 8, "ICH gameport")) { if (! request_region(ich_gameport.io, 8, "ICH gameport")) {
printk(KERN_WARNING "intel8x0: cannot grab gameport 0x%x\n", ich_gameport.io); printk(KERN_WARNING "intel8x0: cannot grab gameport 0x%x\n", ich_gameport.io);
...@@ -2754,6 +2755,7 @@ static int __devinit snd_intel8x0_joystick_probe(struct pci_dev *pci, ...@@ -2754,6 +2755,7 @@ static int __devinit snd_intel8x0_joystick_probe(struct pci_dev *pci,
} }
#endif #endif
#ifdef SUPPORT_MIDI #ifdef SUPPORT_MIDI
val &= ~0x20;
if (mpu_port[dev] > 0) { if (mpu_port[dev] > 0) {
if (mpu_port[dev] == 0x300 || mpu_port[dev] == 0x330) { if (mpu_port[dev] == 0x300 || mpu_port[dev] == 0x330) {
u8 b; u8 b;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7