[PATCH] pci/echoaudio: Remove incorrect part of assertion

[PATCH] pci/echoaudio: Remove incorrect part of assertion

[Mark Hills]

This assertion seems to imply that chip->dsp_code_to_load is a pointer.
It's actually an integer handle on the actual firmware, and 0 has no
special meaning.

The assertion prevents initialisation of a Darla20 card, but would also
affect other models. It seems it was introduced in commit dd7b254d.

ALSA sound/pci/echoaudio/echoaudio.c:2061 Echoaudio driver starting...
ALSA sound/pci/echoaudio/echoaudio.c:1969 chip=ebe4e000
ALSA sound/pci/echoaudio/echoaudio.c:2007 pci=ed568000 irq=19 subdev=0010 Init hardware...
ALSA sound/pci/echoaudio/darla20_dsp.c:36 init_hw() - Darla20
------------[ cut here ]------------
WARNING: at sound/pci/echoaudio/echoaudio_dsp.c:478 init_hw+0x1d1/0x86c [snd_darla20]()
Hardware name: Dell DM051
BUG? (!chip->dsp_code_to_load || !chip->comm_page)

Signed-off-by: Mark Hills <mark@pogo.org.uk>
---
 sound/pci/echoaudio/echoaudio_dsp.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/sound/pci/echoaudio/echoaudio_dsp.c b/sound/pci/echoaudio/echoaudio_dsp.c
index 64417a7..d8c670c 100644
--- a/sound/pci/echoaudio/echoaudio_dsp.c
+++ b/sound/pci/echoaudio/echoaudio_dsp.c
@@ -475,7 +475,7 @@ static int load_firmware(struct echoaudio *chip)
 	const struct firmware *fw;
 	int box_type, err;
 
-	if (snd_BUG_ON(!chip->dsp_code_to_load || !chip->comm_page))
+	if (snd_BUG_ON(!chip->comm_page))
 		return -EPERM;
 
 	/* See if the ASIC is present and working - only if the DSP is already loaded */
-- 
1.7.4.4

Re: [PATCH] pci/echoaudio: Remove incorrect part of assertion

[Takashi Iwai]

At Mon, 30 Apr 2012 19:41:16 +0100,
Mark Hills wrote:
> 
> This assertion seems to imply that chip->dsp_code_to_load is a pointer.
> It's actually an integer handle on the actual firmware, and 0 has no
> special meaning.
> 
> The assertion prevents initialisation of a Darla20 card, but would also
> affect other models. It seems it was introduced in commit dd7b254d.
> 
> ALSA sound/pci/echoaudio/echoaudio.c:2061 Echoaudio driver starting...
> ALSA sound/pci/echoaudio/echoaudio.c:1969 chip=ebe4e000
> ALSA sound/pci/echoaudio/echoaudio.c:2007 pci=ed568000 irq=19 subdev=0010 Init hardware...
> ALSA sound/pci/echoaudio/darla20_dsp.c:36 init_hw() - Darla20
> ------------[ cut here ]------------
> WARNING: at sound/pci/echoaudio/echoaudio_dsp.c:478 init_hw+0x1d1/0x86c [snd_darla20]()
> Hardware name: Dell DM051
> BUG? (!chip->dsp_code_to_load || !chip->comm_page)
> 
> Signed-off-by: Mark Hills <mark@pogo.org.uk>

Sorry for the late reply, as I've been on vacation in the last week.
Applied now.  Thanks.


Takashi


> ---
>  sound/pci/echoaudio/echoaudio_dsp.c |    2 +-
>  1 files changed, 1 insertions(+), 1 deletions(-)
> 
> diff --git a/sound/pci/echoaudio/echoaudio_dsp.c b/sound/pci/echoaudio/echoaudio_dsp.c
> index 64417a7..d8c670c 100644
> --- a/sound/pci/echoaudio/echoaudio_dsp.c
> +++ b/sound/pci/echoaudio/echoaudio_dsp.c
> @@ -475,7 +475,7 @@ static int load_firmware(struct echoaudio *chip)
>  	const struct firmware *fw;
>  	int box_type, err;
>  
> -	if (snd_BUG_ON(!chip->dsp_code_to_load || !chip->comm_page))
> +	if (snd_BUG_ON(!chip->comm_page))
>  		return -EPERM;
>  
>  	/* See if the ASIC is present and working - only if the DSP is already loaded */
> -- 
> 1.7.4.4
>