diff options
| author | Tim Blechmann <tim@klingt.org> | 2008-11-09 12:50:52 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2008-11-09 12:50:52 +0100 |
| commit | 00c9ddd1d4cc73aa0077f379279d716cb0ab0ba5 (patch) | |
| tree | 485c97fc09900498e96aa429700ea3cccbd5143a /sound | |
| parent | fcef7836a31c6432b41a38867d413ed3d6aa8261 (diff) | |
| download | op-kernel-dev-00c9ddd1d4cc73aa0077f379279d716cb0ab0ba5.zip op-kernel-dev-00c9ddd1d4cc73aa0077f379279d716cb0ab0ba5.tar.gz | |
ALSA: HDSP: check for io box before uploading firmware
currently the hdsp driver tries to upload the firmware, even if the
io box is not connected. this patch adds a check for the io box
before trying to upload the firmware.
thus instead of messages complaining about the fifo status and firmware
loading failure, the driver gives a message that no multiface or
digiface is connected.
[A minor coding-style fix by tiwai]
Signed-off-by: Tim Blechmann <tim@klingt.org>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/pci/rme9652/hdsp.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/sound/pci/rme9652/hdsp.c b/sound/pci/rme9652/hdsp.c index d723543..d680114 100644 --- a/sound/pci/rme9652/hdsp.c +++ b/sound/pci/rme9652/hdsp.c @@ -5045,6 +5045,10 @@ static int __devinit snd_hdsp_create(struct snd_card *card, /* we wait 2 seconds to let freshly inserted cardbus cards do their hardware init */ ssleep(2); + err = hdsp_check_for_iobox(hdsp); + if (err < 0) + return err; + if ((hdsp_read (hdsp, HDSP_statusRegister) & HDSP_DllError) != 0) { #ifdef HDSP_FW_LOADER if ((err = hdsp_request_fw_loader(hdsp)) < 0) @@ -5057,7 +5061,7 @@ static int __devinit snd_hdsp_create(struct snd_card *card, /* init is complete, we return */ return 0; #endif - /* no iobox connected, we defer initialization */ + /* we defer initialization */ snd_printk(KERN_INFO "Hammerfall-DSP: card initialization pending : waiting for firmware\n"); if ((err = snd_hdsp_create_hwdep(card, hdsp)) < 0) return err; |
