All of lore.kernel.org
 help / color / mirror / Atom feed
From: Marek Belisko <marek.belisko@open-nandra.com>
To: tony@atomide.com, linux@arm.linux.org.uk
Cc: linux-omap@vger.kernel.org, linux-arm-kernel@lists.infradead.org,
	linux-kernel@vger.kernel.org,
	Marek Belisko <marek.belisko@open-nandra.com>
Subject: [PATCH] omap2+:panda: Make hdmi_mux_init more robust.
Date: Sun, 14 Aug 2011 21:47:15 +0200	[thread overview]
Message-ID: <1313351235-11400-1-git-send-email-marek.belisko@open-nandra.com> (raw)

Add error checking to omap4_panda_hdmi_mux_init function to
avoid problems when mux fails.

Signed-off-by: Marek Belisko <marek.belisko@open-nandra.com>
---
 arch/arm/mach-omap2/board-omap4panda.c |   38 +++++++++++++++++++++++--------
 1 files changed, 28 insertions(+), 10 deletions(-)

diff --git a/arch/arm/mach-omap2/board-omap4panda.c b/arch/arm/mach-omap2/board-omap4panda.c
index 9aaa960..59fba7c 100644
--- a/arch/arm/mach-omap2/board-omap4panda.c
+++ b/arch/arm/mach-omap2/board-omap4panda.c
@@ -485,18 +485,33 @@ int __init omap4_panda_dvi_init(void)
 }
 
 
-static void omap4_panda_hdmi_mux_init(void)
+static int omap4_panda_hdmi_mux_init(void)
 {
+	int ret;
 	/* PAD0_HDMI_HPD_PAD1_HDMI_CEC */
-	omap_mux_init_signal("hdmi_hpd",
-			OMAP_PIN_INPUT_PULLUP);
-	omap_mux_init_signal("hdmi_cec",
-			OMAP_PIN_INPUT_PULLUP);
+	ret = omap_mux_init_signal("hdmi_hpd",
+				OMAP_PIN_INPUT_PULLUP);
+	if (ret)
+		goto err;
+
+	ret = omap_mux_init_signal("hdmi_cec",
+				OMAP_PIN_INPUT_PULLUP);
+	if (ret)
+		goto err;
+
 	/* PAD0_HDMI_DDC_SCL_PAD1_HDMI_DDC_SDA */
-	omap_mux_init_signal("hdmi_ddc_scl",
-			OMAP_PIN_INPUT_PULLUP);
-	omap_mux_init_signal("hdmi_ddc_sda",
-			OMAP_PIN_INPUT_PULLUP);
+	ret = omap_mux_init_signal("hdmi_ddc_scl",
+				OMAP_PIN_INPUT_PULLUP);
+	if (ret)
+		goto err;
+
+	ret = omap_mux_init_signal("hdmi_ddc_sda",
+				OMAP_PIN_INPUT_PULLUP);
+	if (ret)
+		goto err;
+	return 0;
+err:
+	return ret;
 }
 
 static struct gpio panda_hdmi_gpios[] = {
@@ -550,7 +565,10 @@ void omap4_panda_display_init(void)
 	if (r)
 		pr_err("error initializing panda DVI\n");
 
-	omap4_panda_hdmi_mux_init();
+	r = omap4_panda_hdmi_mux_init();
+	if (r)
+		pr_err("error initializing panda HDMI\n");
+
 	omap_display_init(&omap4_panda_dss_data);
 }
 
-- 
1.7.4.1


WARNING: multiple messages have this Message-ID (diff)
From: marek.belisko@open-nandra.com (Marek Belisko)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH] omap2+:panda: Make hdmi_mux_init more robust.
Date: Sun, 14 Aug 2011 21:47:15 +0200	[thread overview]
Message-ID: <1313351235-11400-1-git-send-email-marek.belisko@open-nandra.com> (raw)

Add error checking to omap4_panda_hdmi_mux_init function to
avoid problems when mux fails.

Signed-off-by: Marek Belisko <marek.belisko@open-nandra.com>
---
 arch/arm/mach-omap2/board-omap4panda.c |   38 +++++++++++++++++++++++--------
 1 files changed, 28 insertions(+), 10 deletions(-)

diff --git a/arch/arm/mach-omap2/board-omap4panda.c b/arch/arm/mach-omap2/board-omap4panda.c
index 9aaa960..59fba7c 100644
--- a/arch/arm/mach-omap2/board-omap4panda.c
+++ b/arch/arm/mach-omap2/board-omap4panda.c
@@ -485,18 +485,33 @@ int __init omap4_panda_dvi_init(void)
 }
 
 
-static void omap4_panda_hdmi_mux_init(void)
+static int omap4_panda_hdmi_mux_init(void)
 {
+	int ret;
 	/* PAD0_HDMI_HPD_PAD1_HDMI_CEC */
-	omap_mux_init_signal("hdmi_hpd",
-			OMAP_PIN_INPUT_PULLUP);
-	omap_mux_init_signal("hdmi_cec",
-			OMAP_PIN_INPUT_PULLUP);
+	ret = omap_mux_init_signal("hdmi_hpd",
+				OMAP_PIN_INPUT_PULLUP);
+	if (ret)
+		goto err;
+
+	ret = omap_mux_init_signal("hdmi_cec",
+				OMAP_PIN_INPUT_PULLUP);
+	if (ret)
+		goto err;
+
 	/* PAD0_HDMI_DDC_SCL_PAD1_HDMI_DDC_SDA */
-	omap_mux_init_signal("hdmi_ddc_scl",
-			OMAP_PIN_INPUT_PULLUP);
-	omap_mux_init_signal("hdmi_ddc_sda",
-			OMAP_PIN_INPUT_PULLUP);
+	ret = omap_mux_init_signal("hdmi_ddc_scl",
+				OMAP_PIN_INPUT_PULLUP);
+	if (ret)
+		goto err;
+
+	ret = omap_mux_init_signal("hdmi_ddc_sda",
+				OMAP_PIN_INPUT_PULLUP);
+	if (ret)
+		goto err;
+	return 0;
+err:
+	return ret;
 }
 
 static struct gpio panda_hdmi_gpios[] = {
@@ -550,7 +565,10 @@ void omap4_panda_display_init(void)
 	if (r)
 		pr_err("error initializing panda DVI\n");
 
-	omap4_panda_hdmi_mux_init();
+	r = omap4_panda_hdmi_mux_init();
+	if (r)
+		pr_err("error initializing panda HDMI\n");
+
 	omap_display_init(&omap4_panda_dss_data);
 }
 
-- 
1.7.4.1

             reply	other threads:[~2011-08-14 19:47 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-08-14 19:47 Marek Belisko [this message]
2011-08-14 19:47 ` [PATCH] omap2+:panda: Make hdmi_mux_init more robust Marek Belisko

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=1313351235-11400-1-git-send-email-marek.belisko@open-nandra.com \
    --to=marek.belisko@open-nandra.com \
    --cc=linux-arm-kernel@lists.infradead.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-omap@vger.kernel.org \
    --cc=linux@arm.linux.org.uk \
    --cc=tony@atomide.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.