On Mon, Feb 04, 2013 at 11:43:02AM -0600, Jon Hunter wrote:
> @@ -280,22 +281,22 @@ static int __init omap_dm_timer_init_one(struct
> omap_dm_timer *timer,
> if (IS_ERR(timer->fclk))
> return -ENODEV;
>
> - /* FIXME: Need to remove hard-coded test on timer ID */
> - if (gptimer_id != 12) {
> - struct clk *src;
> -
> - src = clk_get(NULL, fck_source);
> - if (IS_ERR(src)) {
> - r = -EINVAL;
> - } else {
> - r = clk_set_parent(timer->fclk, src);
> - if (IS_ERR_VALUE(r))
> - pr_warn("%s: %s cannot set source\n",
> - __func__, oh->name);
> + src = clk_get(NULL, fck_source);
> + if (IS_ERR(src))
> + return -EINVAL;
This should be:
return PTR_ERR(src);
and should've been there previously...
--
To unsubscribe from this list: send the line "unsubscribe linux-omap" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
