summaryrefslogtreecommitdiffstats
path: root/sound
diff options
context:
space:
mode:
authorTakashi Sakamoto2018-12-09 09:04:19 +0100
committerGreg Kroah-Hartman2018-12-17 09:24:41 +0100
commit03e8b38c517753473fa23bf45f7ace3d27e320e8 (patch)
tree3c9d50142d7f9c5c835aa3e9373819d8876d01d9 /sound
parentdax: Check page->mapping isn't NULL (diff)
downloadkernel-qcow2-linux-03e8b38c517753473fa23bf45f7ace3d27e320e8.tar.gz
kernel-qcow2-linux-03e8b38c517753473fa23bf45f7ace3d27e320e8.tar.xz
kernel-qcow2-linux-03e8b38c517753473fa23bf45f7ace3d27e320e8.zip
ALSA: fireface: fix reference to wrong register for clock configuration
commit fa9c98e4b975bb3192ed6af09d9fa282ed3cd8a0 upstream. In an initial commit, 'SYNC_STATUS' register is referred to get clock configuration, however this is wrong, according to my local note at hand for reverse-engineering about packet dump. It should be 'CLOCK_CONFIG' register. Actually, ff400_dump_clock_config() is correctly programmed. This commit fixes the bug. Cc: <stable@vger.kernel.org> # v4.12+ Fixes: 76fdb3a9e13a ('ALSA: fireface: add support for Fireface 400') Signed-off-by: Takashi Sakamoto <o-takashi@sakamocchi.jp> Signed-off-by: Takashi Iwai <tiwai@suse.de> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'sound')
-rw-r--r--sound/firewire/fireface/ff-protocol-ff400.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/firewire/fireface/ff-protocol-ff400.c b/sound/firewire/fireface/ff-protocol-ff400.c
index 64c3cb0fb926..654a50319198 100644
--- a/sound/firewire/fireface/ff-protocol-ff400.c
+++ b/sound/firewire/fireface/ff-protocol-ff400.c
@@ -30,7 +30,7 @@ static int ff400_get_clock(struct snd_ff *ff, unsigned int *rate,
int err;
err = snd_fw_transaction(ff->unit, TCODE_READ_QUADLET_REQUEST,
- FF400_SYNC_STATUS, &reg, sizeof(reg), 0);
+ FF400_CLOCK_CONFIG, &reg, sizeof(reg), 0);
if (err < 0)
return err;
data = le32_to_cpu(reg);