aboutsummaryrefslogtreecommitdiff
path: root/sound/firewire
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2018-12-10 11:26:53 +0100
committerTakashi Iwai <tiwai@suse.de>2018-12-10 11:26:53 +0100
commit46079bacb469c2eff15802fcccc88b0bd56b1e6e (patch)
tree52f3cc4768b5e63f3efc1979a50c1abee505c6dc /sound/firewire
parente854747d7593c03c03ee785a04dce9b301ae3a9a (diff)
parent0bea4cc8383519f78f3f74caca7bdebdfb346d3b (diff)
downloadlinux-stericsson-46079bacb469c2eff15802fcccc88b0bd56b1e6e.tar.gz
Merge branch 'for-linus' into for-next
Back-merge for resolving the conflict of fixup entries added in both branches. Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/firewire')
-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);