diff options
| author | Dylan Reid <dgreid@chromium.org> | 2013-03-14 17:27:44 -0700 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2013-03-15 07:40:11 +0100 |
| commit | d1d28500cccc269fdbf81ba33d7328d1d2c04b2f (patch) | |
| tree | 00e3d310121c8cbf781e35e6c57a2dabbdae7b7a | |
| parent | 303985f81019571db0b3a6f01fc7f03eb350657e (diff) | |
| download | linux-3.10-d1d28500cccc269fdbf81ba33d7328d1d2c04b2f.tar.gz linux-3.10-d1d28500cccc269fdbf81ba33d7328d1d2c04b2f.tar.bz2 linux-3.10-d1d28500cccc269fdbf81ba33d7328d1d2c04b2f.zip | |
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: Dylan Reid <dgreid@chromium.org>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
| -rw-r--r-- | sound/pci/hda/patch_ca0132.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/sound/pci/hda/patch_ca0132.c b/sound/pci/hda/patch_ca0132.c index eefc4563b2f..cf24b75108d 100644 --- a/sound/pci/hda/patch_ca0132.c +++ b/sound/pci/hda/patch_ca0132.c @@ -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; } |