From mboxrd@z Thu Jan 1 00:00:00 1970 From: balbi@ti.com (Felipe Balbi) Date: Tue, 13 Jan 2015 19:21:48 -0600 Subject: [PATCH 2/7] ARM: OMAP2+: Fix error handling for omap2_clk_enable_init_clocks In-Reply-To: <1421190837-4692-3-git-send-email-tony@atomide.com> References: <1421190837-4692-1-git-send-email-tony@atomide.com> <1421190837-4692-3-git-send-email-tony@atomide.com> Message-ID: <20150114012148.GE18523@saruman> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org On Tue, Jan 13, 2015 at 03:13:52PM -0800, Tony Lindgren wrote: > We need to check if we got the clock before trying to do anything > with it. Otherwise we will get something like this: > > Unable to handle kernel paging request at virtual address fffffffe > ... > [] (clk_prepare) from [] (omap2_clk_enable_init_clocks+0x50/0x8) > [] (omap2_clk_enable_init_clocks) from [] (dm816x_dt_clk_init+0) > ... > > Let's add check for the clock and WARN if the init clock was not > found. > > Cc: Brian Hutchinson > Signed-off-by: Tony Lindgren Just one minor nit below, other than that: Reviewed-by: Felipe Balbi > --- > arch/arm/mach-omap2/clock.c | 5 +++++ > 1 file changed, 5 insertions(+) > > diff --git a/arch/arm/mach-omap2/clock.c b/arch/arm/mach-omap2/clock.c > index 6ad5b4d..89a0732 100644 > --- a/arch/arm/mach-omap2/clock.c > +++ b/arch/arm/mach-omap2/clock.c > @@ -620,6 +620,11 @@ void omap2_clk_enable_init_clocks(const char **clk_names, u8 num_clocks) > > for (i = 0; i < num_clocks; i++) { > init_clk = clk_get(NULL, clk_names[i]); > + if (IS_ERR(init_clk)) { > + WARN(1, "omap clock: could not find init clock %s\n", > + clk_names[i]); you can combine the if with the WARN(): if (WARN(IS_ERR(init_clk), "could not find init clock %s\n", clk_names[i])) not that I also removed that "omap clock" prefix because WARN() will print the file name anyway. > + continue; > + } > clk_prepare_enable(init_clk); > } > } > -- > 2.1.4 > > -- > To unsubscribe from this list: send the line "unsubscribe linux-omap" in > the body of a message to majordomo at vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html -- balbi -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 819 bytes Desc: Digital signature URL: