All of lore.kernel.org
 help / color / mirror / Atom feed
From: Dimitris Papastamos <dp@opensource.wolfsonmicro.com>
To: broonie@kernel.org
Cc: alsa-devel@alsa-project.org, patches@opensource.wolfsonmicro.com
Subject: [PATCH 2/6] ASoC: wm_adsp: Release firmware on memory allocation failure
Date: Fri,  1 Nov 2013 15:56:53 +0000	[thread overview]
Message-ID: <1383321417-1133-3-git-send-email-dp@opensource.wolfsonmicro.com> (raw)
In-Reply-To: <1383321417-1133-1-git-send-email-dp@opensource.wolfsonmicro.com>

Signed-off-by: Dimitris Papastamos <dp@opensource.wolfsonmicro.com>
---
 sound/soc/codecs/wm_adsp.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/sound/soc/codecs/wm_adsp.c b/sound/soc/codecs/wm_adsp.c
index 076da02..4008ceb 100644
--- a/sound/soc/codecs/wm_adsp.c
+++ b/sound/soc/codecs/wm_adsp.c
@@ -689,7 +689,8 @@ static int wm_adsp_load(struct wm_adsp *dsp)
 						&buf_list);
 			if (!buf) {
 				adsp_err(dsp, "Out of memory\n");
-				return -ENOMEM;
+				ret = -ENOMEM;
+				goto out_fw;
 			}
 
 			ret = regmap_raw_write_async(regmap, reg, buf->buf,
-- 
1.8.4.2

  parent reply	other threads:[~2013-11-01 15:57 UTC|newest]

Thread overview: 13+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-11-01 15:56 [PATCH 0/6] ASoC: wm_adsp: Couple of updates Dimitris Papastamos
2013-11-01 15:56 ` [PATCH 1/6] ASoC: wm_adsp: Print error when regmap reads/writes fail Dimitris Papastamos
2013-11-01 17:48   ` Mark Brown
2013-11-01 15:56 ` Dimitris Papastamos [this message]
2013-11-01 17:48   ` [PATCH 2/6] ASoC: wm_adsp: Release firmware on memory allocation failure Mark Brown
2013-11-01 15:56 ` [PATCH 3/6] ASoC: wm_adsp: Interpret ADSP memory region lengths as 32 bit words Dimitris Papastamos
2013-11-01 17:47   ` Mark Brown
2013-11-01 15:56 ` [PATCH 4/6] ASoC: wm_adsp: Add debug info on get()/put() transfers Dimitris Papastamos
2013-11-01 17:49   ` Mark Brown
2013-11-01 15:56 ` [PATCH 5/6] ASoC: wm_adsp: Remove and free algorithm regions for ADSP1 Dimitris Papastamos
2013-11-01 17:49   ` Mark Brown
2013-11-01 15:56 ` [PATCH 6/6] ASoC: wm_adsp: Print out the firmware version Dimitris Papastamos
2013-11-01 17:49   ` Mark Brown

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=1383321417-1133-3-git-send-email-dp@opensource.wolfsonmicro.com \
    --to=dp@opensource.wolfsonmicro.com \
    --cc=alsa-devel@alsa-project.org \
    --cc=broonie@kernel.org \
    --cc=patches@opensource.wolfsonmicro.com \
    /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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.