Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d1d28500 authored by Dylan Reid's avatar Dylan Reid Committed by Takashi Iwai
Browse files

ALSA: hda/ca0132 - Check if dspload_image succeeded. 



If dspload_image() fails, it was ignored and dspload_wait_loaded() was
still called.  dsp_loaded should never be set to true in this case,
skip it.  The check in dspload_wait_loaded() return true if the DSP is
loaded or if it never started.

Signed-off-by: default avatarDylan Reid <dgreid@chromium.org>
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent 303985f8

sound/pci/hda/patch_ca0132.c

+6 −2
Original line number Diff line number Diff line
@@ -4351,12 +4351,16 @@ static bool ca0132_download_dsp_images(struct hda_codec *codec) 
		return false;



	dsp_os_image = (struct dsp_image_seg *)(fw_entry->data);

	dspload_image(codec, dsp_os_image, 0, 0, true, 0);

	if (dspload_image(codec, dsp_os_image, 0, 0, true, 0)) {

		pr_err("ca0132 dspload_image failed.\n");

		goto exit_download;

	}



	dsp_loaded = dspload_wait_loaded(codec);



exit_download:

	release_firmware(fw_entry);





	return dsp_loaded;

}