aboutsummaryrefslogtreecommitdiffstats
path: root/sound/pci/rme9652/hdsp.c
diff options
context:
space:
mode:
Diffstat (limited to 'sound/pci/rme9652/hdsp.c')
-rw-r--r--sound/pci/rme9652/hdsp.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/sound/pci/rme9652/hdsp.c b/sound/pci/rme9652/hdsp.c
index 61f82f0d5cc6..eaf3c22449ad 100644
--- a/sound/pci/rme9652/hdsp.c
+++ b/sound/pci/rme9652/hdsp.c
@@ -389,7 +389,7 @@ MODULE_SUPPORTED_DEVICE("{{RME Hammerfall-DSP},"
389 389
390/* use hotplug firmeare loader? */ 390/* use hotplug firmeare loader? */
391#if defined(CONFIG_FW_LOADER) || defined(CONFIG_FW_LOADER_MODULE) 391#if defined(CONFIG_FW_LOADER) || defined(CONFIG_FW_LOADER_MODULE)
392#ifndef HDSP_USE_HWDEP_LOADER 392#if !defined(HDSP_USE_HWDEP_LOADER) && !defined(CONFIG_SND_HDSP)
393#define HDSP_FW_LOADER 393#define HDSP_FW_LOADER
394#endif 394#endif
395#endif 395#endif
@@ -3169,9 +3169,10 @@ snd_hdsp_proc_read(struct snd_info_entry *entry, struct snd_info_buffer *buffer)
3169 char *clock_source; 3169 char *clock_source;
3170 int x; 3170 int x;
3171 3171
3172 if (hdsp_check_for_iobox (hdsp)) 3172 if (hdsp_check_for_iobox (hdsp)) {
3173 snd_iprintf(buffer, "No I/O box connected.\nPlease connect one and upload firmware.\n"); 3173 snd_iprintf(buffer, "No I/O box connected.\nPlease connect one and upload firmware.\n");
3174 return; 3174 return;
3175 }
3175 3176
3176 if (hdsp_check_for_firmware(hdsp, 0)) { 3177 if (hdsp_check_for_firmware(hdsp, 0)) {
3177 if (hdsp->state & HDSP_FirmwareCached) { 3178 if (hdsp->state & HDSP_FirmwareCached) {
@@ -3470,7 +3471,7 @@ static void __devinit snd_hdsp_proc_init(struct hdsp *hdsp)
3470 struct snd_info_entry *entry; 3471 struct snd_info_entry *entry;
3471 3472
3472 if (! snd_card_proc_new(hdsp->card, "hdsp", &entry)) 3473 if (! snd_card_proc_new(hdsp->card, "hdsp", &entry))
3473 snd_info_set_text_ops(entry, hdsp, 1024, snd_hdsp_proc_read); 3474 snd_info_set_text_ops(entry, hdsp, snd_hdsp_proc_read);
3474} 3475}
3475 3476
3476static void snd_hdsp_free_buffers(struct hdsp *hdsp) 3477static void snd_hdsp_free_buffers(struct hdsp *hdsp)