diff options
| author | Takashi Iwai <tiwai@suse.de> | 2018-12-10 11:26:53 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2018-12-10 11:26:53 +0100 |
| commit | 46079bacb469c2eff15802fcccc88b0bd56b1e6e (patch) | |
| tree | 52f3cc4768b5e63f3efc1979a50c1abee505c6dc /sound/firewire | |
| parent | ALSA: hda/realtek - Enable headset button support for new codec (diff) | |
| parent | ALSA: hda/realtek: Enable audio jacks of ASUS UX433FN/UX333FA with ALC294 (diff) | |
| download | linux-46079bacb469c2eff15802fcccc88b0bd56b1e6e.tar.xz linux-46079bacb469c2eff15802fcccc88b0bd56b1e6e.zip | |
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.c | 2 |
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, ®, sizeof(reg), 0); + FF400_CLOCK_CONFIG, ®, sizeof(reg), 0); if (err < 0) return err; data = le32_to_cpu(reg); |