Skip to contentSkip to conversation

OMAP: hwmod regression fix for 2.6.35-rc

PATCH New Paul Walmsley 1 participant 2 messages Jun 24, 2010

Subsystems (4)
Arm (32-bit) Arm sub-architectures OMAP2+ support OMAP hwmod support
lore
Share & tools
lore

Paul Walmsley

author maintainer
#0 lore raw

PATCH 1/1 OMAP: hwmod regression fix for 2.6.35-rc

Hi,

This patch (intended for 2.6.35-rc) fixes a bad regression in 2.6.35-rc preventing the hwmod code from working.

- Paul

---

Benoit Cousson (1):
OMAP: hwmod: Fix the missing braces

 arch/arm/mach-omap2/omap_hwmod.c |    9 ++++++---
 1 files changed, 6 insertions(+), 3 deletions(-)
author maintainer
#1 lore raw

PATCH 1/1 OMAP: hwmod: Fix the missing braces

From: Benoit Cousson <[email protected]>

As reported by Sergei, a couple of braces were missing after the WARN removal patch.

[07/22] OMAP: hwmod: Replace WARN by pr_warning if clock lookup failed

https://patchwork.kernel.org/patch/100756/

Signed-off-by Benoit Cousson <[email protected]>
[paul at pwsan.com: fixed patch description per Anand's E-mail]
Signed-off-by Paul Walmsley <[email protected]>
Cc Sergei Shtylyov <[email protected]>
Cc Anand Gadiyar <[email protected]>
---
 arch/arm/mach-omap2/omap_hwmod.c |    9 ++++++---
 1 files changed, 6 insertions(+), 3 deletions(-)
arch/arm/mach-omap2/omap_hwmod.c +6 -3
index 95c9a5f..b7a4133 100644
@@ -409,10 +409,11 @@ static int _init_main_clk(struct omap_hwmod *oh)
 		return 0;
 
 	oh->_clk = omap_clk_get_by_name(oh->main_clk);
-	if (!oh->_clk)
+	if (!oh->_clk) {
 		pr_warning("omap_hwmod: %s: cannot clk_get main_clk %s\n",
 			   oh->name, oh->main_clk);
 		return -EINVAL;
+	}
 
 	if (!oh->_clk->clkdm)
 		pr_warning("omap_hwmod: %s: missing clockdomain for %s.\n",

@@ -444,10 +445,11 @@ static int _init_interface_clks(struct omap_hwmod *oh)
 			continue;
 
 		c = omap_clk_get_by_name(os->clk);
-		if (!c)
+		if (!c) {
 			pr_warning("omap_hwmod: %s: cannot clk_get interface_clk %s\n",
 				   oh->name, os->clk);
 			ret = -EINVAL;
+		}
 		os->_clk = c;
 	}
 

@@ -470,10 +472,11 @@ static int _init_opt_clks(struct omap_hwmod *oh)
 
 	for (i = oh->opt_clks_cnt, oc = oh->opt_clks; i > 0; i--, oc++) {
 		c = omap_clk_get_by_name(oc->clk);
-		if (!c)
+		if (!c) {
 			pr_warning("omap_hwmod: %s: cannot clk_get opt_clk %s\n",
 				   oh->name, oc->clk);
 			ret = -EINVAL;
+		}
 		oc->_clk = c;
 	}