diff options
author | Mark Brown <broonie@linaro.org> | 2013-09-11 11:17:15 +0100 |
---|---|---|
committer | Mark Brown <broonie@linaro.org> | 2013-09-11 11:17:15 +0100 |
commit | c34c0d7684b8b79666da6b1bc37fc330cd0dd216 (patch) | |
tree | c2bc72d67862df770af45a88814759baa0744d2c /sound/usb/usx2y/usbusx2y.c | |
parent | 29dc5dd229dc3130b51df0932e59946fc09d3bd4 (diff) | |
parent | 4345adf92db760ca1a54061ce284aaa2e7d0791e (diff) | |
download | linux-c34c0d7684b8b79666da6b1bc37fc330cd0dd216.tar.gz linux-c34c0d7684b8b79666da6b1bc37fc330cd0dd216.tar.bz2 linux-c34c0d7684b8b79666da6b1bc37fc330cd0dd216.zip |
Merge remote-tracking branch 'asoc/fix/fsl' into asoc-linus
Diffstat (limited to 'sound/usb/usx2y/usbusx2y.c')
-rw-r--r-- | sound/usb/usx2y/usbusx2y.c | 8 |
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); } |