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

Commit 44d1b6dd authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip 

Pull timer fix from Thomas Gleixner:
 "A single fix to the pistachio clocksource driver using the proper
  signedness in the error print format"

* 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  clocksource/drivers/pistachio: Correct output format of PTR_ERR()
parents 0f0fbec9 b7c8b4aa

drivers/clocksource/time-pistachio.c

+2 −2
Original line number Diff line number Diff line
@@ -163,7 +163,7 @@ static void __init pistachio_clksrc_of_init(struct device_node *node) 


	periph_regs = syscon_regmap_lookup_by_phandle(node, "img,cr-periph");

	if (IS_ERR(periph_regs)) {

		pr_err("cannot get peripheral regmap (%lu)\n",

		pr_err("cannot get peripheral regmap (%ld)\n",

		       PTR_ERR(periph_regs));

		return;

	}
@@ -176,7 +176,7 @@ static void __init pistachio_clksrc_of_init(struct device_node *node) 


	sys_clk = of_clk_get_by_name(node, "sys");

	if (IS_ERR(sys_clk)) {

		pr_err("clock get failed (%lu)\n", PTR_ERR(sys_clk));

		pr_err("clock get failed (%ld)\n", PTR_ERR(sys_clk));

		return;

	}