* Jon Hunter <jon-hunter@xxxxxx> [121108 09:21]:
>
> On 11/07/2012 05:44 PM, Tony Lindgren wrote:
>
> That's a bugger. I completely missed your patch last week sorry (I will blame the Danish
> beer) and had clearly not folded in to my testing!
:)
> > I guess we should apply the following fix somewhere or
> > do we need to check other places too?
>
> I will re-test your master branch today and put it through my dmtimer tests to double check.
> However, in general I did ensure that we checked pdata was not NULL before accessing when
> I introduced the dt stuff. In my changelog [1] I had ...
>
> "5. When device-tree is present the platform_data structure will be NULL and so check for
> this."
>
> I just need to make sure that get_context_loss_count() is not called before checking it is
> populated.
OK
> > +
> > + if (pdata) {
> > + timer->capability = pdata->timer_capability;
>
> You don't need this it is already handled a few lines before.
>
> > + timer->get_context_loss_count = pdata->get_context_loss_count;
>
> We could probably move this too. For example ...
OK yeah makes sense to me.
Regards,
Tony
> diff --git a/arch/arm/plat-omap/dmtimer.c b/arch/arm/plat-omap/dmtimer.c
> index 38c12ef..9dca23e 100644
> --- a/arch/arm/plat-omap/dmtimer.c
> +++ b/arch/arm/plat-omap/dmtimer.c
> @@ -799,12 +799,11 @@ static int __devinit omap_dm_timer_probe(struct platform_device *pdev)
> timer->id = pdev->id;
> timer->capability = pdata->timer_capability;
> timer->reserved = omap_dm_timer_reserved_systimer(timer->id);
> + timer->get_context_loss_count = pdata->get_context_loss_count;
> }
>
> timer->irq = irq->start;
> timer->pdev = pdev;
> - timer->capability = pdata->timer_capability;
> - timer->get_context_loss_count = pdata->get_context_loss_count;
>
> /* Skip pm_runtime_enable for OMAP1 */
> if (!(timer->capability & OMAP_TIMER_NEEDS_RESET)) {
>
> Cheers
> Jon
>
> [1] http://marc.info/?l=linux-omap&m=135065877008624&w=2
--
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
