1 files changed, 35 insertions, 13 deletions

diff --git a/sound/pci/rme9652/hdsp.c b/sound/pci/rme9652/hdsp.c
index e5a52da77b85..d3e07de433b0 100644
--- a/sound/pci/rme9652/hdsp.c
+++ b/sound/pci/rme9652/hdsp.c
@@ -726,22 +726,36 @@ static int hdsp_get_iobox_version (struct hdsp *hdsp)
 }
 
 
-static int hdsp_check_for_firmware (struct hdsp *hdsp, int show_err)
+#ifdef HDSP_FW_LOADER
+static int __devinit hdsp_request_fw_loader(struct hdsp *hdsp);
+#endif
+
+static int hdsp_check_for_firmware (struct hdsp *hdsp, int load_on_demand)
 {
-        if (hdsp->io_type == H9652 || hdsp->io_type == H9632) return 0;
+        if (hdsp->io_type == H9652 || hdsp->io_type == H9632)
+                return 0;
         if ((hdsp_read (hdsp, HDSP_statusRegister) & HDSP_DllError) != 0) {
-                snd_printk(KERN_ERR "Hammerfall-DSP: firmware not present.\n");
                 hdsp->state &= ~HDSP_FirmwareLoaded;
-                if (! show_err)
+                if (! load_on_demand)
                         return -EIO;
+                snd_printk(KERN_ERR "Hammerfall-DSP: firmware not present.\n");
                 /* try to load firmware */
-                if (hdsp->state & HDSP_FirmwareCached) {
-                        if (snd_hdsp_load_firmware_from_cache(hdsp) != 0)
-                                snd_printk(KERN_ERR "Hammerfall-DSP: Firmware loading from cache failed, please upload manually.\n");
-                } else {
-                        snd_printk(KERN_ERR "Hammerfall-DSP: No firmware loaded nor cached, please upload firmware.\n");
+                if (! (hdsp->state & HDSP_FirmwareCached)) {
+#ifdef HDSP_FW_LOADER
+                        if (! hdsp_request_fw_loader(hdsp))
+                                return 0;
+#endif
+                        snd_printk(KERN_ERR
+                                   "Hammerfall-DSP: No firmware loaded nor "
+                                   "cached, please upload firmware.\n");
+                        return -EIO;
+                }
+                if (snd_hdsp_load_firmware_from_cache(hdsp) != 0) {
+                        snd_printk(KERN_ERR
+                                   "Hammerfall-DSP: Firmware loading from "
+                                   "cache failed, please upload manually.\n");
+                        return -EIO;
                 }
-                return -EIO;
         }
         return 0;
 }
@@ -3181,8 +3195,16 @@ snd_hdsp_proc_read(struct snd_info_entry *entry, struct snd_info_buffer *buffer)
                                 return;
                         }
                 } else {
-                        snd_iprintf(buffer, "No firmware loaded nor cached, please upload firmware.\n");
-                        return;
+                        int err = -EINVAL;
+#ifdef HDSP_FW_LOADER
+                        err = hdsp_request_fw_loader(hdsp);
+#endif
+                        if (err < 0) {
+                                snd_iprintf(buffer,
+                                            "No firmware loaded nor cached, "
+                                            "please upload firmware.\n");
+                                return;
+                        }
                 }
         }
         
@@ -3851,7 +3873,7 @@ static int snd_hdsp_trigger(struct snd_pcm_substream *substream, int cmd)
         if (hdsp_check_for_iobox (hdsp))
                 return -EIO;
 
-        if (hdsp_check_for_firmware(hdsp, 1))
+        if (hdsp_check_for_firmware(hdsp, 0)) /* no auto-loading in trigger */
                 return -EIO;
 
         spin_lock(&hdsp->lock);