diff options
| author |   Takashi Sakamoto <o-takashi@sakamocchi.jp> | 2020-01-13 17:46:28 +0900 |
|---|---|---|
| committer |   Takashi Iwai <tiwai@suse.de> | 2020-01-13 10:43:27 +0100 |
| commit | 3e2dc6bdb56893bc28257e482e1dbe5d39f313df (patch) | |
| tree | 8776b64cd8261490b5218da868117420559a6fae /sound/firewire | |
| parent | ALSA: firewire-tascam: fix corruption due to spin lock without restoration in SoftIRQ context (diff) | |
| download | linux-dev-3e2dc6bdb56893bc28257e482e1dbe5d39f313df.tar.xz linux-dev-3e2dc6bdb56893bc28257e482e1dbe5d39f313df.zip | |
ALSA: dice: fix fallback from protocol extension into limited functionality
At failure of attempt to detect protocol extension, ALSA dice driver
should be fallback to limited functionality. However it's not.
This commit fixes it.
Cc: <stable@vger.kernel.org> # v4.18+
Fixes: 58579c056c1c9 ("ALSA: dice: use extended protocol to detect available stream formats")
Signed-off-by: Takashi Sakamoto <o-takashi@sakamocchi.jp>
Link: https://lore.kernel.org/r/20200113084630.14305-2-o-takashi@sakamocchi.jp
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/firewire')
| -rw-r--r-- | sound/firewire/dice/dice-extension.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/sound/firewire/dice/dice-extension.c b/sound/firewire/dice/dice-extension.c index a63fcbc875ad..02f4a8318e38 100644 --- a/sound/firewire/dice/dice-extension.c +++ b/sound/firewire/dice/dice-extension.c @@ -159,8 +159,11 @@ int snd_dice_detect_extension_formats(struct snd_dice *dice) int j; for (j = i + 1; j < 9; ++j) { - if (pointers[i * 2] == pointers[j * 2]) + if (pointers[i * 2] == pointers[j * 2]) { + // Fallback to limited functionality. + err = -ENXIO; goto end; + } } } |