[PATCHv2 02/12] ARM: OMAP2+: hwmod code/data: fix 32K sync timer

Kevin Hilman khilman at ti.com
Thu Jul 5 18:06:31 EDT 2012


Paul Walmsley <paul at pwsan.com> writes:

> Hi Benoît
>
> On Wed, 4 Jul 2012, Benoit Cousson wrote:
>
>> > @@ -1141,8 +1144,16 @@ static void _enable_sysc(struct omap_hwmod *oh)
>> >  	sf = oh->class->sysc->sysc_flags;
>> >  
>> >  	if (sf & SYSC_HAS_SIDLEMODE) {
>> > -		idlemode = (oh->flags & HWMOD_SWSUP_SIDLE) ?
>> > -			HWMOD_IDLEMODE_NO : HWMOD_IDLEMODE_SMART;
>> > +		clkdm_act = ((oh->clkdm &&
>> > +			      oh->clkdm->flags & CLKDM_ACTIVE_WITH_MPU) ||
>> > +			     (oh->_clk->clkdm &&
>> 
>> This is crashing on OMAP4 due to a NULL oh->_clk that can happen on some
>> hwmod.
>> 
>> +			     (oh->_clk && oh->_clk->clkdm &&
>> 
>> Is fixing the issue.
>
> Thanks, just made the change and pushed the patch up to 
> git://git.pwsan.com/linux-2.6 in the branch 'omap_fixes_c_3.5rc'

OK, to ensure this fix gets into v3.5-rc, I'm taking the version from
this branch and queuing up as a PM fix Tony.

Kevin



More information about the linux-arm-kernel mailing list