diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-09-22 19:54:53 (GMT) |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-09-22 20:01:40 (GMT) |
| commit | ae19ffbadc1b2100285a5b5b3d0a4e0a11390904 (patch) | |
| tree | 3c2086ab67398a019089a47ca3f362a4bc6db74f /drivers/staging/line6/capture.c | |
| parent | 34e84f39a27d059a3e6ec6e8b94aafa702e6f220 (diff) | |
| parent | 9173a8ef24a6b1b8031507b35b8ffe5f85a87692 (diff) | |
| download | linux-fsl-qoriq-ae19ffbadc1b2100285a5b5b3d0a4e0a11390904.tar.xz | |
Merge branch 'master' into for-linus
Diffstat (limited to 'drivers/staging/line6/capture.c')
| -rw-r--r-- | drivers/staging/line6/capture.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/staging/line6/capture.c b/drivers/staging/line6/capture.c index 8393e25..ea2060b 100644 --- a/drivers/staging/line6/capture.c +++ b/drivers/staging/line6/capture.c @@ -26,7 +26,7 @@ */ static int submit_audio_in_urb(struct snd_pcm_substream *substream) { - int index; + unsigned int index; unsigned long flags; struct snd_line6_pcm *line6pcm = snd_pcm_substream_chip(substream); int i, urb_size; @@ -35,7 +35,7 @@ static int submit_audio_in_urb(struct snd_pcm_substream *substream) spin_lock_irqsave(&line6pcm->lock_audio_in, flags); index = find_first_zero_bit(&line6pcm->active_urb_in, LINE6_ISO_BUFFERS); - if (index < 0 || index >= LINE6_ISO_BUFFERS) { + if (index >= LINE6_ISO_BUFFERS) { spin_unlock_irqrestore(&line6pcm->lock_audio_in, flags); dev_err(s2m(substream), "no free URB found\n"); return -EINVAL; |