Skip to content

wm_adsp: Fixing mismerge #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed

wm_adsp: Fixing mismerge #2

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 1 addition & 8 deletions sound/soc/codecs/wm_adsp.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1857,6 +1857,7 @@ static int wm_adsp_load_coeff(struct wm_adsp *dsp)
}

out_fw:
regmap_async_complete(regmap);
release_firmware(firmware);
wm_adsp_buf_free(&buf_list);
out:
Expand Down Expand Up @@ -3169,14 +3170,6 @@ int wm_adsp_stream_start2(struct wm_adsp *adsp)
adsp_dbg(adsp, "Set watermark to %u\n", adsp->capt_watermark2);

return 0;

out_fw:
regmap_async_complete(regmap);
release_firmware(firmware);
wm_adsp_buf_free(&buf_list);
out:
kfree(file);
return ret;
}
EXPORT_SYMBOL_GPL(wm_adsp_stream_start2);

Expand Down