lkml.org 
[lkml]   [2011]   [Aug]   [14]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
From
Subject[PATCH] omap2+:panda: Make hdmi_mux_init more robust.
Date
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


\
 
 \ /
  Last update: 2011-08-14 21:49    [W:0.044 / U:0.192 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site