From: Dylan Reid <dgreid@chromium.org>
To: alsa-devel@alsa-project.org
Cc: tiwai@suse.de, Dylan Reid <dgreid@chromium.org>,
chee_kin@ctl.creative.com, ian_minett@creativelabs.com
Subject: [PATCH 1/3] ALSA: hda/ca0132 - Check if dspload_image succeeded.
Date: Thu, 14 Mar 2013 17:27:44 -0700 [thread overview]
Message-ID: <1363307266-30055-2-git-send-email-dgreid@chromium.org> (raw)
In-Reply-To: <1363307266-30055-1-git-send-email-dgreid@chromium.org>
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>
---
sound/pci/hda/patch_ca0132.c | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/sound/pci/hda/patch_ca0132.c b/sound/pci/hda/patch_ca0132.c
index eefc456..cf24b75 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;
}
--
1.8.1.3.605.g02339dd
next prev parent reply other threads:[~2013-03-15 0:27 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-03-15 0:27 [PATCH 0/3] ALSA: hda/ca0132 - Better handle a failed DSP firmware load Dylan Reid
2013-03-15 0:27 ` Dylan Reid [this message]
2013-03-15 0:27 ` [PATCH 2/3] ALSA: hda/ca0132 - Check download state of DSP Dylan Reid
2013-03-15 0:27 ` [PATCH 3/3] ALSA: hda/ca0132 - Remove extra setting of dsp_state Dylan Reid
2013-03-15 6:46 ` [PATCH 0/3] ALSA: hda/ca0132 - Better handle a failed DSP firmware load Takashi Iwai
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1363307266-30055-2-git-send-email-dgreid@chromium.org \
--to=dgreid@chromium.org \
--cc=alsa-devel@alsa-project.org \
--cc=chee_kin@ctl.creative.com \
--cc=ian_minett@creativelabs.com \
--cc=tiwai@suse.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).