Skip to contentSkip to conversation

clockevents fixes for 4.6

GIT PULL New Daniel Lezcano 1 participant 2 messages Apr 22, 2016 Clocksource, clockevent drivers

lore
Share & tools
lore
#0 lore raw

Hi Thomas, Ingo,

Please pull this fix for the tango xtal driver.

* Fix the boot hang on Sigma Design Tango4 by inverting the error check condition at init time (Daniel Lezcano)

The following changes since commit b7c8b4aac6ea6746b1c49fda0a0563a07203dd26:

clocksource/drivers/pistachio: Correct output format of PTR_ERR()
(2016-03-23 12:30:40 +0100)

are available in the git repository at:

http://git.linaro.org/people/daniel.lezcano/linux.git
clockevents/4.6-fixes

for you to fetch changes up to 16eeed7e5558a3dcf30f75526a896b2632f299f9:

clocksource/drivers/tango-xtal: Fix boot hang due to incorrect test
(2016-04-22 09:22:37 +0200)

----------------------------------------------------------------
Daniel Lezcano (1):
clocksource/drivers/tango-xtal: Fix boot hang due to incorrect test

 drivers/clocksource/tango_xtal.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
#1 lore raw

PATCH 1/1 clocksource/drivers/tango-xtal: Fix boot hang due to incorrect test

Commit 0881841f7e78 introduced a regression by inverting a test check after calling clocksource_mmio_init(). That results on the system to hang at boot time.

Fix it by inverting the test again.

Fixes 0881841f7e78 ("Replace code by clocksource_mmio_init")
---
 drivers/clocksource/tango_xtal.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/clocksource/tango_xtal.c +1 -1
index 2bcecaf..c407c47 100644
@@ -42,7 +42,7 @@ static void __init tango_clocksource_init(struct device_node *np)
 
 	ret = clocksource_mmio_init(xtal_in_cnt, "tango-xtal", xtal_freq, 350,
 				    32, clocksource_mmio_readl_up);
-	if (!ret) {
+	if (ret) {
 		pr_err("%s: registration failed\n", np->full_name);
 		return;
 	}
Signature · 1 line
1.9.1