diff options
| author | Chris Zankel <chris@zankel.net> | 2015-08-29 23:55:58 (GMT) |
|---|---|---|
| committer | Chris Zankel <chris@zankel.net> | 2015-08-29 23:55:58 (GMT) |
| commit | 650c919798c71fb34b77a6f2ba03a06907f06a76 (patch) | |
| tree | d1c60012d4d86846d25f1d0b783b5122c26a2e31 /sound/usb/line6/pcm.c | |
| parent | 895fb3159280fe7695b35ec7c87ec19e13ca5b6e (diff) | |
| parent | 64291f7db5bd8150a74ad2036f1037e6a0428df2 (diff) | |
| download | linux-650c919798c71fb34b77a6f2ba03a06907f06a76.tar.xz | |
Merge tag 'v4.2' into for_next
Linux 4.2
Diffstat (limited to 'sound/usb/line6/pcm.c')
| -rw-r--r-- | sound/usb/line6/pcm.c | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/sound/usb/line6/pcm.c b/sound/usb/line6/pcm.c index 8461d6b..204cc07 100644 --- a/sound/usb/line6/pcm.c +++ b/sound/usb/line6/pcm.c @@ -186,12 +186,8 @@ static int line6_stream_start(struct snd_line6_pcm *line6pcm, int direction, int ret = 0; spin_lock_irqsave(&pstr->lock, flags); - if (!test_and_set_bit(type, &pstr->running)) { - if (pstr->active_urbs || pstr->unlink_urbs) { - ret = -EBUSY; - goto error; - } - + if (!test_and_set_bit(type, &pstr->running) && + !(pstr->active_urbs || pstr->unlink_urbs)) { pstr->count = 0; /* Submit all currently available URBs */ if (direction == SNDRV_PCM_STREAM_PLAYBACK) @@ -199,7 +195,6 @@ static int line6_stream_start(struct snd_line6_pcm *line6pcm, int direction, else ret = line6_submit_audio_in_all_urbs(line6pcm); } - error: if (ret < 0) clear_bit(type, &pstr->running); spin_unlock_irqrestore(&pstr->lock, flags); |