mirror of
https://github.com/torvalds/linux.git
synced 2024-12-14 15:13:52 +00:00
627661ced8
A commit28b208f600('ALSA: dice: add parameters of stream formats for models produced by Alesis') adds wrong copy to rx parameters instead of tx parameters for Alesis iO26. This commit fixes the bug for v4.18-rc8. Fixes:28b208f600('ALSA: dice: add parameters of stream formats for models produced by Alesis') Signed-off-by: Takashi Sakamoto <o-takashi@sakamocchi.jp> Cc: <stable@vger.kernel.org> # v4.18 Signed-off-by: Takashi Iwai <tiwai@suse.de>
53 lines
1.2 KiB
C
53 lines
1.2 KiB
C
// SPDX-License-Identifier: GPL-2.0
|
|
/*
|
|
* dice-alesis.c - a part of driver for DICE based devices
|
|
*
|
|
* Copyright (c) 2018 Takashi Sakamoto
|
|
*/
|
|
|
|
#include "dice.h"
|
|
|
|
static const unsigned int
|
|
alesis_io14_tx_pcm_chs[MAX_STREAMS][SND_DICE_RATE_MODE_COUNT] = {
|
|
{6, 6, 4}, /* Tx0 = Analog + S/PDIF. */
|
|
{8, 4, 0}, /* Tx1 = ADAT1. */
|
|
};
|
|
|
|
static const unsigned int
|
|
alesis_io26_tx_pcm_chs[MAX_STREAMS][SND_DICE_RATE_MODE_COUNT] = {
|
|
{10, 10, 8}, /* Tx0 = Analog + S/PDIF. */
|
|
{16, 8, 0}, /* Tx1 = ADAT1 + ADAT2. */
|
|
};
|
|
|
|
int snd_dice_detect_alesis_formats(struct snd_dice *dice)
|
|
{
|
|
__be32 reg;
|
|
u32 data;
|
|
int i;
|
|
int err;
|
|
|
|
err = snd_dice_transaction_read_tx(dice, TX_NUMBER_AUDIO, ®,
|
|
sizeof(reg));
|
|
if (err < 0)
|
|
return err;
|
|
data = be32_to_cpu(reg);
|
|
|
|
if (data == 4 || data == 6) {
|
|
memcpy(dice->tx_pcm_chs, alesis_io14_tx_pcm_chs,
|
|
MAX_STREAMS * SND_DICE_RATE_MODE_COUNT *
|
|
sizeof(unsigned int));
|
|
} else {
|
|
memcpy(dice->tx_pcm_chs, alesis_io26_tx_pcm_chs,
|
|
MAX_STREAMS * SND_DICE_RATE_MODE_COUNT *
|
|
sizeof(unsigned int));
|
|
}
|
|
|
|
for (i = 0; i < SND_DICE_RATE_MODE_COUNT; ++i)
|
|
dice->rx_pcm_chs[0][i] = 8;
|
|
|
|
dice->tx_midi_ports[0] = 1;
|
|
dice->rx_midi_ports[0] = 1;
|
|
|
|
return 0;
|
|
}
|