diff options
author | Takashi Iwai <tiwai@suse.de> | 2018-10-04 07:52:58 +0200 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2018-10-04 07:53:06 +0200 |
commit | 4a9a72e0db5e584267944f4d868f46419b2fab59 (patch) | |
tree | 95e3b2f13e41cad37fdeff87ef5c1366bba39497 /sound/firewire/fireface | |
parent | 2e75b676c3284930489a968d33b75e5d2b2c36c6 (diff) | |
parent | 709ae62e8e6d9ac4df7dadb3b8ae432675c45ef9 (diff) | |
download | linux-stable-4a9a72e0db5e584267944f4d868f46419b2fab59.tar.gz linux-stable-4a9a72e0db5e584267944f4d868f46419b2fab59.tar.bz2 linux-stable-4a9a72e0db5e584267944f4d868f46419b2fab59.zip |
Merge branch 'for-linus' into for-next
Back-merge 4.19-devel branch into 4.20 for applying FireWire patches
cleanly.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/firewire/fireface')
-rw-r--r-- | sound/firewire/fireface/ff-protocol-ff400.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/sound/firewire/fireface/ff-protocol-ff400.c b/sound/firewire/fireface/ff-protocol-ff400.c index ad7a0a32557d..64c3cb0fb926 100644 --- a/sound/firewire/fireface/ff-protocol-ff400.c +++ b/sound/firewire/fireface/ff-protocol-ff400.c @@ -146,6 +146,7 @@ static int ff400_switch_fetching_mode(struct snd_ff *ff, bool enable) { __le32 *reg; int i; + int err; reg = kcalloc(18, sizeof(__le32), GFP_KERNEL); if (reg == NULL) @@ -163,9 +164,11 @@ static int ff400_switch_fetching_mode(struct snd_ff *ff, bool enable) reg[i] = cpu_to_le32(0x00000001); } - return snd_fw_transaction(ff->unit, TCODE_WRITE_BLOCK_REQUEST, - FF400_FETCH_PCM_FRAMES, reg, - sizeof(__le32) * 18, 0); + err = snd_fw_transaction(ff->unit, TCODE_WRITE_BLOCK_REQUEST, + FF400_FETCH_PCM_FRAMES, reg, + sizeof(__le32) * 18, 0); + kfree(reg); + return err; } static void ff400_dump_sync_status(struct snd_ff *ff, |