From: Hauke Mehrtens <hauke@hauke-m.de>
Date: Sun, 4 Jun 2023 12:05:03 +0000 (+0200)
Subject: lantiq: Fix bug in error handling of timer driver
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=e79dacd962f9ef3b443eda376eba42512ac6e529;p=openwrt%2Fstaging%2Fblocktrron.git

lantiq: Fix bug in error handling of timer driver

If the reverted timer driver fails to allocate interrupts handle the
error better.

Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
[moved printk before the cleanup for-loop]
Signed-off-by: Martin Schiller <ms@dev.tdt.de>
---

diff --git a/target/linux/lantiq/patches-5.15/0008-MIPS-lantiq-backport-old-timer-code.patch b/target/linux/lantiq/patches-5.15/0008-MIPS-lantiq-backport-old-timer-code.patch
index 16b87ed0a5..5721e017b3 100644
--- a/target/linux/lantiq/patches-5.15/0008-MIPS-lantiq-backport-old-timer-code.patch
+++ b/target/linux/lantiq/patches-5.15/0008-MIPS-lantiq-backport-old-timer-code.patch
@@ -981,7 +981,7 @@ Signed-off-by: John Crispin <blogic@openwrt.org>
 +int __init lq_gptu_init(void)
 +{
 +	int ret;
-+	unsigned int i;
++	int i;
 +
 +	ltq_w32(0, LQ_GPTU_IRNEN);
 +	ltq_w32(0xfff, LQ_GPTU_IRNCR);
@@ -1007,10 +1007,10 @@ Signed-off-by: John Crispin <blogic@openwrt.org>
 +	for (i = 0; i < timer_dev.number_of_timers; i++) {
 +		ret = request_irq(TIMER_INTERRUPT + i, timer_irq_handler, IRQF_TIMER, gptu_miscdev.name, &timer_dev.timer[i]);
 +		if (ret) {
-+			for (; i >= 0; i--)
++			printk(KERN_ERR "gptu: failed in requesting irq (%d), get error %d\n", i, -ret);
++			for (i--; i >= 0; i--)
 +				free_irq(TIMER_INTERRUPT + i, &timer_dev.timer[i]);
 +			misc_deregister(&gptu_miscdev);
-+			printk(KERN_ERR "gptu: failed in requesting irq (%d), get error %d\n", i, -ret);
 +			return ret;
 +		} else {
 +			timer_dev.timer[i].irq = TIMER_INTERRUPT + i;
diff --git a/target/linux/lantiq/patches-6.1/0008-MIPS-lantiq-backport-old-timer-code.patch b/target/linux/lantiq/patches-6.1/0008-MIPS-lantiq-backport-old-timer-code.patch
index 16b87ed0a5..5721e017b3 100644
--- a/target/linux/lantiq/patches-6.1/0008-MIPS-lantiq-backport-old-timer-code.patch
+++ b/target/linux/lantiq/patches-6.1/0008-MIPS-lantiq-backport-old-timer-code.patch
@@ -981,7 +981,7 @@ Signed-off-by: John Crispin <blogic@openwrt.org>
 +int __init lq_gptu_init(void)
 +{
 +	int ret;
-+	unsigned int i;
++	int i;
 +
 +	ltq_w32(0, LQ_GPTU_IRNEN);
 +	ltq_w32(0xfff, LQ_GPTU_IRNCR);
@@ -1007,10 +1007,10 @@ Signed-off-by: John Crispin <blogic@openwrt.org>
 +	for (i = 0; i < timer_dev.number_of_timers; i++) {
 +		ret = request_irq(TIMER_INTERRUPT + i, timer_irq_handler, IRQF_TIMER, gptu_miscdev.name, &timer_dev.timer[i]);
 +		if (ret) {
-+			for (; i >= 0; i--)
++			printk(KERN_ERR "gptu: failed in requesting irq (%d), get error %d\n", i, -ret);
++			for (i--; i >= 0; i--)
 +				free_irq(TIMER_INTERRUPT + i, &timer_dev.timer[i]);
 +			misc_deregister(&gptu_miscdev);
-+			printk(KERN_ERR "gptu: failed in requesting irq (%d), get error %d\n", i, -ret);
 +			return ret;
 +		} else {
 +			timer_dev.timer[i].irq = TIMER_INTERRUPT + i;