[alsa-devel] [patch] ALSA: usx2y: remove an unneeded check

Takashi Iwai tiwai at suse.de
Mon Jul 29 14:00:05 CEST 2013


At Sun, 28 Jul 2013 23:27:38 +0300,
Dan Carpenter wrote:
> 
> The test here is always true because S[i].urb is an array not a pointer.
> Also it's bogus because the intent was to test:
> 	if (S->urb[i]) {
> instead of:
> 	if (S[i].urb) {
> 
> Anway, usb_kill_urb() and usb_free_urb() accept NULL pointers so we can
> just remove this.
> 
> Signed-off-by: Dan Carpenter <dan.carpenter at oracle.com>

Thanks, applied.


Takashi

> 
> diff --git a/sound/usb/usx2y/usbusx2y.c b/sound/usb/usx2y/usbusx2y.c
> index 1f9bbd5..5a51b18 100644
> --- a/sound/usb/usx2y/usbusx2y.c
> +++ b/sound/usb/usx2y/usbusx2y.c
> @@ -305,11 +305,9 @@ static void usX2Y_unlinkSeq(struct snd_usX2Y_AsyncSeq *S)
>  {
>  	int	i;
>  	for (i = 0; i < URBS_AsyncSeq; ++i) {
> -		if (S[i].urb) {
> -			usb_kill_urb(S->urb[i]);
> -			usb_free_urb(S->urb[i]);
> -			S->urb[i] = NULL;
> -		}
> +		usb_kill_urb(S->urb[i]);
> +		usb_free_urb(S->urb[i]);
> +		S->urb[i] = NULL;
>  	}
>  	kfree(S->buffer);
>  }
> 


More information about the Alsa-devel mailing list