aboutsummaryrefslogtreecommitdiffstats
path: root/sound/pci/ymfpci/ymfpci_main.c
diff options
context:
space:
mode:
Diffstat (limited to 'sound/pci/ymfpci/ymfpci_main.c')
-rw-r--r--sound/pci/ymfpci/ymfpci_main.c12
1 files changed, 5 insertions, 7 deletions
diff --git a/sound/pci/ymfpci/ymfpci_main.c b/sound/pci/ymfpci/ymfpci_main.c
index fd12674d0394..b34c3bce270b 100644
--- a/sound/pci/ymfpci/ymfpci_main.c
+++ b/sound/pci/ymfpci/ymfpci_main.c
@@ -1998,9 +1998,7 @@ static void snd_ymfpci_disable_dsp(struct snd_ymfpci *chip)
1998 } 1998 }
1999} 1999}
2000 2000
2001#define FIRMWARE_IN_THE_KERNEL 2001#ifdef CONFIG_SND_YMFPCI_FIRMWARE_IN_KERNEL
2002
2003#ifdef FIRMWARE_IN_THE_KERNEL
2004 2002
2005#include "ymfpci_image.h" 2003#include "ymfpci_image.h"
2006 2004
@@ -2047,7 +2045,7 @@ static int snd_ymfpci_request_firmware(struct snd_ymfpci *chip)
2047 } 2045 }
2048 } 2046 }
2049 if (err < 0) { 2047 if (err < 0) {
2050#ifdef FIRMWARE_IN_THE_KERNEL 2048#ifdef CONFIG_SND_YMFPCI_FIRMWARE_IN_KERNEL
2051 chip->dsp_microcode = &snd_ymfpci_dsp_microcode; 2049 chip->dsp_microcode = &snd_ymfpci_dsp_microcode;
2052#else 2050#else
2053 return err; 2051 return err;
@@ -2070,7 +2068,7 @@ static int snd_ymfpci_request_firmware(struct snd_ymfpci *chip)
2070 } 2068 }
2071 } 2069 }
2072 if (err < 0) { 2070 if (err < 0) {
2073#ifdef FIRMWARE_IN_THE_KERNEL 2071#ifdef CONFIG_SND_YMFPCI_FIRMWARE_IN_KERNEL
2074 chip->controller_microcode = 2072 chip->controller_microcode =
2075 is_1e ? &snd_ymfpci_controller_1e_microcode 2073 is_1e ? &snd_ymfpci_controller_1e_microcode
2076 : &snd_ymfpci_controller_microcode; 2074 : &snd_ymfpci_controller_microcode;
@@ -2259,11 +2257,11 @@ static int snd_ymfpci_free(struct snd_ymfpci *chip)
2259 pci_write_config_word(chip->pci, 0x40, chip->old_legacy_ctrl); 2257 pci_write_config_word(chip->pci, 0x40, chip->old_legacy_ctrl);
2260 2258
2261 pci_disable_device(chip->pci); 2259 pci_disable_device(chip->pci);
2262#ifdef FIRMWARE_IN_THE_KERNEL 2260#ifdef CONFIG_SND_YMFPCI_FIRMWARE_IN_KERNEL
2263 if (chip->dsp_microcode != &snd_ymfpci_dsp_microcode) 2261 if (chip->dsp_microcode != &snd_ymfpci_dsp_microcode)
2264#endif 2262#endif
2265 release_firmware(chip->dsp_microcode); 2263 release_firmware(chip->dsp_microcode);
2266#ifdef FIRMWARE_IN_THE_KERNEL 2264#ifdef CONFIG_SND_YMFPCI_FIRMWARE_IN_KERNEL
2267 if (chip->controller_microcode != &snd_ymfpci_controller_microcode && 2265 if (chip->controller_microcode != &snd_ymfpci_controller_microcode &&
2268 chip->controller_microcode != &snd_ymfpci_controller_1e_microcode) 2266 chip->controller_microcode != &snd_ymfpci_controller_1e_microcode)
2269#endif 2267#endif