Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8ac5ba61 authored by Paul Mundt's avatar Paul Mundt
Browse files

Merge branches 'sh/rtc' and 'common/clkfwk' into sh/urgent

parents bea27827 899be96d ed10b490

drivers/rtc/rtc-sh.c

+2 −2
Original line number Diff line number Diff line
@@ -761,7 +761,7 @@ err_unmap: 
	clk_put(rtc->clk);

	iounmap(rtc->regbase);

err_badmap:

	release_resource(rtc->res);

	release_mem_region(rtc->res->start, rtc->regsize);

err_badres:

	kfree(rtc);
@@ -786,7 +786,7 @@ static int __exit sh_rtc_remove(struct platform_device *pdev) 
	}



	iounmap(rtc->regbase);

	release_resource(rtc->res);

	release_mem_region(rtc->res->start, rtc->regsize);



	clk_disable(rtc->clk);

	clk_put(rtc->clk);

drivers/sh/clk/core.c

+2 −2
Original line number Diff line number Diff line
@@ -571,7 +571,7 @@ long clk_round_parent(struct clk *clk, unsigned long target, 
					*best_freq = freq_max;

			}



			pr_debug("too low freq %lu, error %lu\n", freq->frequency,

			pr_debug("too low freq %u, error %lu\n", freq->frequency,

				 target - freq_max);



			if (!error)
@@ -591,7 +591,7 @@ long clk_round_parent(struct clk *clk, unsigned long target, 
					*best_freq = freq_min;

			}



			pr_debug("too high freq %lu, error %lu\n", freq->frequency,

			pr_debug("too high freq %u, error %lu\n", freq->frequency,

				 freq_min - target);



			if (!error)