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
Merge to Fedora kernel-2.6.17-1.2187_FC5 patched with stable patch-2.6.17.13-vs2...
[linux-2.6.git]
/
sound
/
pci
/
rme9652
/
hdsp.c
diff --git
a/sound/pci/rme9652/hdsp.c
b/sound/pci/rme9652/hdsp.c
index
61f82f0
..
10586e4
100644
(file)
--- a/
sound/pci/rme9652/hdsp.c
+++ b/
sound/pci/rme9652/hdsp.c
@@
-389,7
+389,7
@@
MODULE_SUPPORTED_DEVICE("{{RME Hammerfall-DSP},"
/* use hotplug firmeare loader? */
#if defined(CONFIG_FW_LOADER) || defined(CONFIG_FW_LOADER_MODULE)
/* use hotplug firmeare loader? */
#if defined(CONFIG_FW_LOADER) || defined(CONFIG_FW_LOADER_MODULE)
-#if
ndef HDSP_USE_HWDEP_LOADER
+#if
!defined(HDSP_USE_HWDEP_LOADER) && !defined(CONFIG_SND_HDSP)
#define HDSP_FW_LOADER
#endif
#endif
#define HDSP_FW_LOADER
#endif
#endif
@@
-3169,9
+3169,10
@@
snd_hdsp_proc_read(struct snd_info_entry *entry, struct snd_info_buffer *buffer)
char *clock_source;
int x;
char *clock_source;
int x;
- if (hdsp_check_for_iobox (hdsp))
+ if (hdsp_check_for_iobox (hdsp))
{
snd_iprintf(buffer, "No I/O box connected.\nPlease connect one and upload firmware.\n");
return;
snd_iprintf(buffer, "No I/O box connected.\nPlease connect one and upload firmware.\n");
return;
+ }
if (hdsp_check_for_firmware(hdsp, 0)) {
if (hdsp->state & HDSP_FirmwareCached) {
if (hdsp_check_for_firmware(hdsp, 0)) {
if (hdsp->state & HDSP_FirmwareCached) {