diff options
author | Takashi Iwai <tiwai@suse.de> | 2009-05-18 06:40:52 -0400 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2009-05-18 06:40:52 -0400 |
commit | 313f6e2d40bd67e394a65e7d64acd0cf9c9d248d (patch) | |
tree | a55d433ae09bfd42c5ccc4cf92f4fe41be962cd5 | |
parent | 6c627f3978bf3059d45713e2e1240b7c43cc85f5 (diff) |
ALSA: hda - Avoid conflicts with snd-ctxfi driver
The PCI entries of Creative with HD-audio class can be the devices
with emu20k1/emu20k2 chips. These are supported better by snd-ctxfi
driver. With that driver, the device will mutate from HD-audio to
its native class.
This patch adds a simple ifdef to avoid the conflict of device probe
between snd-hda-intel and snd-ctxfi drivers. 1102:0009 seems still
OK to be added as it has no emu20kx chip, and is a pure HD-audio
device.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
-rw-r--r-- | sound/pci/hda/hda_intel.c | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/sound/pci/hda/hda_intel.c b/sound/pci/hda/hda_intel.c index 04f19f8cad84..7bb6dd2cb6cc 100644 --- a/sound/pci/hda/hda_intel.c +++ b/sound/pci/hda/hda_intel.c | |||
@@ -2517,10 +2517,19 @@ static struct pci_device_id azx_ids[] = { | |||
2517 | /* Teradici */ | 2517 | /* Teradici */ |
2518 | { PCI_DEVICE(0x6549, 0x1200), .driver_data = AZX_DRIVER_TERA }, | 2518 | { PCI_DEVICE(0x6549, 0x1200), .driver_data = AZX_DRIVER_TERA }, |
2519 | /* Creative X-Fi (CA0110-IBG) */ | 2519 | /* Creative X-Fi (CA0110-IBG) */ |
2520 | #if !defined(CONFIG_SND_CTXFI) && !defined(CONFIG_SND_CTXFI_MODULE) | ||
2521 | /* the following entry conflicts with snd-ctxfi driver, | ||
2522 | * as ctxfi driver mutates from HD-audio to native mode with | ||
2523 | * a special command sequence. | ||
2524 | */ | ||
2520 | { PCI_DEVICE(PCI_VENDOR_ID_CREATIVE, PCI_ANY_ID), | 2525 | { PCI_DEVICE(PCI_VENDOR_ID_CREATIVE, PCI_ANY_ID), |
2521 | .class = PCI_CLASS_MULTIMEDIA_HD_AUDIO << 8, | 2526 | .class = PCI_CLASS_MULTIMEDIA_HD_AUDIO << 8, |
2522 | .class_mask = 0xffffff, | 2527 | .class_mask = 0xffffff, |
2523 | .driver_data = AZX_DRIVER_GENERIC }, | 2528 | .driver_data = AZX_DRIVER_GENERIC }, |
2529 | #else | ||
2530 | /* this entry seems still valid -- i.e. without emu20kx chip */ | ||
2531 | { PCI_DEVICE(0x1102, 0x0009), .driver_data = AZX_DRIVER_GENERIC }, | ||
2532 | #endif | ||
2524 | /* AMD Generic, PCI class code and Vendor ID for HD Audio */ | 2533 | /* AMD Generic, PCI class code and Vendor ID for HD Audio */ |
2525 | { PCI_DEVICE(PCI_VENDOR_ID_ATI, PCI_ANY_ID), | 2534 | { PCI_DEVICE(PCI_VENDOR_ID_ATI, PCI_ANY_ID), |
2526 | .class = PCI_CLASS_MULTIMEDIA_HD_AUDIO << 8, | 2535 | .class = PCI_CLASS_MULTIMEDIA_HD_AUDIO << 8, |