From: xerofoify@gmail.com (Nicholas Krause)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH] mach-s3c64xx:Fix error handling for certain calls to s3c_gpio_cfgpin_range in the file dev-audio.c
Date: Wed, 16 Sep 2015 21:51:13 -0400 [thread overview]
Message-ID: <1442454673-26752-1-git-send-email-xerofoify@gmail.com> (raw)
This fixes error handling for calls to the function
s3c_gpio_cfgpin_range in the file dev-audio.c that
assume calls to this particular function always run
successfully to properly check now if these calls
fail by returning a error code and if so return it
directly to the call of these functions in order for
the caller to be able to handle these failed calls in
its own error path(s).
Signed-off-by: Nicholas Krause <xerofoify@gmail.com>
---
arch/arm/mach-s3c64xx/dev-audio.c | 12 +++++++-----
1 file changed, 7 insertions(+), 5 deletions(-)
diff --git a/arch/arm/mach-s3c64xx/dev-audio.c b/arch/arm/mach-s3c64xx/dev-audio.c
index ff780a8..81fabdb 100644
--- a/arch/arm/mach-s3c64xx/dev-audio.c
+++ b/arch/arm/mach-s3c64xx/dev-audio.c
@@ -27,6 +27,7 @@
static int s3c64xx_i2s_cfg_gpio(struct platform_device *pdev)
{
unsigned int base;
+ int ret;
switch (pdev->id) {
case 0:
@@ -47,9 +48,9 @@ static int s3c64xx_i2s_cfg_gpio(struct platform_device *pdev)
return -EINVAL;
}
- s3c_gpio_cfgpin_range(base, 5, S3C_GPIO_SFN(3));
-
- return 0;
+ ret = s3c_gpio_cfgpin_range(base, 5, S3C_GPIO_SFN(3));
+
+ return ret;
}
static struct resource s3c64xx_iis0_resource[] = {
@@ -122,6 +123,7 @@ EXPORT_SYMBOL(s3c64xx_device_iisv4);
static int s3c64xx_pcm_cfg_gpio(struct platform_device *pdev)
{
unsigned int base;
+ int ret;
switch (pdev->id) {
case 0:
@@ -136,8 +138,8 @@ static int s3c64xx_pcm_cfg_gpio(struct platform_device *pdev)
return -EINVAL;
}
- s3c_gpio_cfgpin_range(base, 5, S3C_GPIO_SFN(2));
- return 0;
+ ret = s3c_gpio_cfgpin_range(base, 5, S3C_GPIO_SFN(2));
+ return ret;
}
static struct resource s3c64xx_pcm0_resource[] = {
--
2.1.4
next reply other threads:[~2015-09-17 1:51 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-09-17 1:51 Nicholas Krause [this message]
2015-09-17 2:05 ` [PATCH] mach-s3c64xx:Fix error handling for certain calls to s3c_gpio_cfgpin_range in the file dev-audio.c Krzysztof Kozlowski
2015-09-17 2:48 ` nick
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=1442454673-26752-1-git-send-email-xerofoify@gmail.com \
--to=xerofoify@gmail.com \
--cc=linux-arm-kernel@lists.infradead.org \
/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).