diff options
| author | Takashi Iwai | 2018-05-15 07:30:23 +0200 |
|---|---|---|
| committer | Takashi Iwai | 2018-05-15 07:30:23 +0200 |
| commit | 8def12d9cd45b6abad87c5dc5a88a18c739762be (patch) | |
| tree | 232020665442fb2c8bd55f4878c1735535dfd8a7 /sound/firewire/dice | |
| parent | ALSA: hda/ca0132: fix array_size.cocci warnings (diff) | |
| parent | ALSA: usb-audio: Use Class Specific EP for UAC3 devices. (diff) | |
| download | kernel-qcow2-linux-8def12d9cd45b6abad87c5dc5a88a18c739762be.tar.gz kernel-qcow2-linux-8def12d9cd45b6abad87c5dc5a88a18c739762be.tar.xz kernel-qcow2-linux-8def12d9cd45b6abad87c5dc5a88a18c739762be.zip | |
Merge branch 'for-linus' into for-next
Back-merge of UAC3 fixes for applying further enhancements.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/firewire/dice')
| -rw-r--r-- | sound/firewire/dice/dice-stream.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/firewire/dice/dice-stream.c b/sound/firewire/dice/dice-stream.c index 422a1ab1ddf5..c3c892c5c7ff 100644 --- a/sound/firewire/dice/dice-stream.c +++ b/sound/firewire/dice/dice-stream.c @@ -519,7 +519,7 @@ int snd_dice_stream_init_duplex(struct snd_dice *dice) err = init_stream(dice, AMDTP_IN_STREAM, i); if (err < 0) { for (; i >= 0; i--) - destroy_stream(dice, AMDTP_OUT_STREAM, i); + destroy_stream(dice, AMDTP_IN_STREAM, i); goto end; } } |