[alsa-devel] [patch] ALSA: oxfw: fix a condition in start_stream()

Takashi Sakamoto o-takashi at sakamocchi.jp
Fri Feb 27 01:36:53 CET 2015


Hi Dan,

On Feb 27 2015 05:32, Dan Carpenter wrote:
> Static checkers complain that this function doesn't return negative
> error codes.  The comments for amdtp_stream_wait_callback() say that we
> should stop the stream if it returns false.
> 
> Fixes: f3699e2c7745 ('ALSA: oxfw: Change the way to start stream')
> Signed-off-by: Dan Carpenter <dan.carpenter at oracle.com>

Thanks for this patch, while the error code should be assigned to
-ETIMEDOUT, as the other drivers do.

I post an alternative patch to fix them.


Thanks

Takashi Sakamoto

> diff --git a/sound/firewire/oxfw/oxfw-stream.c b/sound/firewire/oxfw/oxfw-stream.c
> index 29ccb36..ee67581 100644
> --- a/sound/firewire/oxfw/oxfw-stream.c
> +++ b/sound/firewire/oxfw/oxfw-stream.c
> @@ -172,7 +172,7 @@ static int start_stream(struct snd_oxfw *oxfw, struct amdtp_stream *stream,
>  
>  	/* Wait first packet */
>  	err = amdtp_stream_wait_callback(stream, CALLBACK_TIMEOUT);
> -	if (err < 0)
> +	if (err == 0)
>  		stop_stream(oxfw, stream);
>  end:
>  	return err;


More information about the Alsa-devel mailing list