"Mittal, Mukund" <mmittal@xxxxxx> writes:
> From: Mukund Mittal <mmittal@xxxxxx>
>
> OMAP: timer-gp: Fix for null pointer dereferencing issue
>
> Calling WARN() to warn for null pointer dereferencing for gpt pointer.
>
> Signed-off-by: Mukund Mittal <mmittal@xxxxxx>
> ---
> arch/arm/mach-omap2/timer-gp.c | 14 +++++++-------
> 1 files changed, 7 insertions(+), 7 deletions(-)
>
> Index: linux-omap-2.6/arch/arm/mach-omap2/timer-gp.c
> ===================================================================
> --- linux-omap-2.6.orig/arch/arm/mach-omap2/timer-gp.c
> +++ linux-omap-2.6/arch/arm/mach-omap2/timer-gp.c
> @@ -205,14 +205,9 @@ static void __init omap2_gp_clocksource_
> {
> static struct omap_dm_timer *gpt;
> u32 tick_rate, tick_period;
> - static char err1[] __initdata = KERN_ERR
> - "%s: failed to request dm-timer\n";
> - static char err2[] __initdata = KERN_ERR
> - "%s: can't register clocksource!\n";
Why remove these? Please keep and re-use the __initdata strings.
> gpt = omap_dm_timer_request();
> - if (!gpt)
> - printk(err1, clocksource_gpt.name);
> + WARN(!gpt, "%s: failed to request dm-timer\n", clocksource_gpt.name);
And you want WARN_ON() when you have a conditional warning.
> gpt_clocksource = gpt;
>
> omap_dm_timer_set_source(gpt, OMAP_TIMER_SRC_SYS_CLK);
> @@ -224,7 +219,8 @@ static void __init omap2_gp_clocksource_
> clocksource_gpt.mult =
> clocksource_khz2mult(tick_rate/1000, clocksource_gpt.shift);
> if (clocksource_register(&clocksource_gpt))
> - printk(err2, clocksource_gpt.name);
> + printk(KERN_ERR "%s: can't register clocksource!\n",
> + clocksource_gpt.name);
> }
> #endif
>
--
To unsubscribe from this list: send the line "unsubscribe linux-omap" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
