summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDan Carpenter <dan.carpenter@oracle.com>2013-07-28 22:27:38 +0200
committerTakashi Iwai <tiwai@suse.de>2013-07-29 13:59:47 +0200
commit85054b2153f18eac16df9ff88913c98adea6a23e (patch)
tree24ad3ecc343b8eb4bf0fa77d667d162aad2b58a5
parentALSA: hda - use azx_writew() for 16-bit length register (diff)
downloadlinux-85054b2153f18eac16df9ff88913c98adea6a23e.tar.xz
linux-85054b2153f18eac16df9ff88913c98adea6a23e.zip
ALSA: usx2y: remove an unneeded check
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) { Anyway, usb_kill_urb() and usb_free_urb() accept NULL pointers so we can just remove this. Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com> Signed-off-by: Takashi Iwai <tiwai@suse.de>
-rw-r--r--sound/usb/usx2y/usbusx2y.c8
1 files changed, 3 insertions, 5 deletions
diff --git a/sound/usb/usx2y/usbusx2y.c b/sound/usb/usx2y/usbusx2y.c
index 1f9bbd55553f..5a51b18c50fe 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);
}