From: Peter Griffin <peter.griffin@linaro.org>
To: linux-arm-kernel@lists.infradead.org,
linux-kernel@vger.kernel.org, srinivas.kandagatla@gmail.com,
maxime.coquelin@st.com, patrice.chotard@st.com,
mchehab@osg.samsung.com
Cc: peter.griffin@linaro.org, lee.jones@linaro.org,
linux-media@vger.kernel.org, devicetree@vger.kernel.org,
hugues.fruchet@st.com
Subject: [PATCH v5 6/6] [media] c8sectpfe: Simplify for loop in load_slim_core_fw
Date: Thu, 3 Sep 2015 18:59:54 +0100 [thread overview]
Message-ID: <1441303194-28211-7-git-send-email-peter.griffin@linaro.org> (raw)
In-Reply-To: <1441303194-28211-1-git-send-email-peter.griffin@linaro.org>
Signed-off-by: Peter Griffin <peter.griffin@linaro.org>
---
drivers/media/platform/sti/c8sectpfe/c8sectpfe-core.c | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/drivers/media/platform/sti/c8sectpfe/c8sectpfe-core.c b/drivers/media/platform/sti/c8sectpfe/c8sectpfe-core.c
index c691e13..ce72ffb 100644
--- a/drivers/media/platform/sti/c8sectpfe/c8sectpfe-core.c
+++ b/drivers/media/platform/sti/c8sectpfe/c8sectpfe-core.c
@@ -1096,7 +1096,7 @@ static int load_slim_core_fw(const struct firmware *fw, void *context)
Elf32_Ehdr *ehdr;
Elf32_Phdr *phdr;
u8 __iomem *dst;
- int err, i;
+ int err = 0, i;
if (!fw || !context)
return -EINVAL;
@@ -1105,7 +1105,7 @@ static int load_slim_core_fw(const struct firmware *fw, void *context)
phdr = (Elf32_Phdr *)(fw->data + ehdr->e_phoff);
/* go through the available ELF segments */
- for (i = 0; i < ehdr->e_phnum && !err; i++, phdr++) {
+ for (i = 0; i < ehdr->e_phnum; i++, phdr++) {
/* Only consider LOAD segments */
if (phdr->p_type != PT_LOAD)
@@ -1118,7 +1118,7 @@ static int load_slim_core_fw(const struct firmware *fw, void *context)
dev_err(fei->dev,
"Segment %d is outside of firmware file\n", i);
err = -EINVAL;
- break;
+ goto err;
}
/*
@@ -1146,6 +1146,7 @@ static int load_slim_core_fw(const struct firmware *fw, void *context)
}
}
+err:
release_firmware(fw);
return err;
}
--
1.9.1
prev parent reply other threads:[~2015-09-03 17:59 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-09-03 17:59 [PATCH v5 0/6] [media] c8sectpfe: Various fixups Peter Griffin
2015-09-03 17:59 ` [PATCH v5 1/6] ARM: DT: STi: stihxxx-b2120: Add pulse-width properties to ssc2 & ssc3 Peter Griffin
2015-09-03 17:59 ` [PATCH v5 2/6] ARM: DT: STi: STiH407: Add c8sectpfe LinuxDVB DT node Peter Griffin
2015-09-03 17:59 ` [PATCH v5 3/6] [media] c8sectpfe: Remove select on undefined LIBELF_32 Peter Griffin
2015-09-03 17:59 ` [PATCH v5 4/6] [media] c8sectpfe: Update binding to reset-gpios Peter Griffin
2015-09-03 17:59 ` [PATCH v5 5/6] [media] c8sectpfe: Update DT binding doc with some minor fixes Peter Griffin
2015-09-03 17:59 ` Peter Griffin [this message]
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=1441303194-28211-7-git-send-email-peter.griffin@linaro.org \
--to=peter.griffin@linaro.org \
--cc=devicetree@vger.kernel.org \
--cc=hugues.fruchet@st.com \
--cc=lee.jones@linaro.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-media@vger.kernel.org \
--cc=maxime.coquelin@st.com \
--cc=mchehab@osg.samsung.com \
--cc=patrice.chotard@st.com \
--cc=srinivas.kandagatla@gmail.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 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).