| Message ID | 1470942147-19848-16-git-send-email-dev@andree.sk (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Thu, 11 Aug 2016 21:02:27 +0200, Andrej Krutak wrote: > > If there's an error, pcm is released in line6_pcm_acquire already. > > Signed-off-by: Andrej Krutak <dev@andree.sk> This looks like a fix independent from your patchset. In that case, submit it individually so that I can merge it beforehand. Takashi > --- > sound/usb/line6/pcm.c | 1 - > 1 file changed, 1 deletion(-) > > diff --git a/sound/usb/line6/pcm.c b/sound/usb/line6/pcm.c > index 13b3b27..455244c 100644 > --- a/sound/usb/line6/pcm.c > +++ b/sound/usb/line6/pcm.c > @@ -55,7 +55,6 @@ static int snd_line6_impulse_volume_put(struct snd_kcontrol *kcontrol, > err = line6_pcm_acquire(line6pcm, LINE6_STREAM_IMPULSE, true); > if (err < 0) { > line6pcm->impulse_volume = 0; > - line6_pcm_release(line6pcm, LINE6_STREAM_IMPULSE); > return err; > } > } else { > -- > 1.9.1 > > _______________________________________________ > Alsa-devel mailing list > Alsa-devel@alsa-project.org > http://mailman.alsa-project.org/mailman/listinfo/alsa-devel >
diff --git a/sound/usb/line6/pcm.c b/sound/usb/line6/pcm.c index 13b3b27..455244c 100644 --- a/sound/usb/line6/pcm.c +++ b/sound/usb/line6/pcm.c @@ -55,7 +55,6 @@ static int snd_line6_impulse_volume_put(struct snd_kcontrol *kcontrol, err = line6_pcm_acquire(line6pcm, LINE6_STREAM_IMPULSE, true); if (err < 0) { line6pcm->impulse_volume = 0; - line6_pcm_release(line6pcm, LINE6_STREAM_IMPULSE); return err; } } else {
If there's an error, pcm is released in line6_pcm_acquire already. Signed-off-by: Andrej Krutak <dev@andree.sk> --- sound/usb/line6/pcm.c | 1 - 1 file changed, 1 deletion(-)