aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/imx6/patches-4.4/112-serial-imx-let-irq-handler-return-IRQ_NONE-if-no-eve.patch
diff options
context:
space:
mode:
authorStijn Segers <francesco.borromini@inventati.org>2017-01-21 18:30:10 +0100
committerStijn Tintel <stijn@linux-ipv6.be>2017-02-06 20:13:06 +0100
commitee3067c588139ef60a72f5fecac979580d3651e3 (patch)
tree28aa45985bfe69be66152958ed830137d18c72cd /target/linux/imx6/patches-4.4/112-serial-imx-let-irq-handler-return-IRQ_NONE-if-no-eve.patch
parent518bb7ae5a91d779ab28ab377ede188ed4a7ae6c (diff)
downloadupstream-ee3067c588139ef60a72f5fecac979580d3651e3.tar.gz
upstream-ee3067c588139ef60a72f5fecac979580d3651e3.tar.bz2
upstream-ee3067c588139ef60a72f5fecac979580d3651e3.zip
Kernel: bump to 4.4.44
Bump kernel to 4.4.44. Compile-tested on ar71xx, ramips/mt7621 and x86/64. .44 has been run-tested on the 17.01 branch here on ar71xx and mt7621. Signed-off-by: Stijn Segers <francesco.borromini@inventati.org> (cherry picked from commit 20996edd68b8a0b139bdb36b3aafa29c037d4bda) Signed-off-by: Stijn Tintel <stijn@linux-ipv6.be> Conflicts: target/linux/ar71xx/patches-4.4/920-usb-chipidea-AR933x-platform-support.patch target/linux/ar71xx/patches-4.4/930-chipidea-pullup.patch
Diffstat (limited to 'target/linux/imx6/patches-4.4/112-serial-imx-let-irq-handler-return-IRQ_NONE-if-no-eve.patch')
-rw-r--r--target/linux/imx6/patches-4.4/112-serial-imx-let-irq-handler-return-IRQ_NONE-if-no-eve.patch9
1 files changed, 2 insertions, 7 deletions
diff --git a/target/linux/imx6/patches-4.4/112-serial-imx-let-irq-handler-return-IRQ_NONE-if-no-eve.patch b/target/linux/imx6/patches-4.4/112-serial-imx-let-irq-handler-return-IRQ_NONE-if-no-eve.patch
index 0b803b7bda..a4f2951590 100644
--- a/target/linux/imx6/patches-4.4/112-serial-imx-let-irq-handler-return-IRQ_NONE-if-no-eve.patch
+++ b/target/linux/imx6/patches-4.4/112-serial-imx-let-irq-handler-return-IRQ_NONE-if-no-eve.patch
@@ -16,11 +16,9 @@ Signed-off-by: Petr Štetiar <ynezz@true.cz>
drivers/tty/serial/imx.c | 17 +++++++++++++----
1 file changed, 13 insertions(+), 4 deletions(-)
-diff --git a/drivers/tty/serial/imx.c b/drivers/tty/serial/imx.c
-index bfc4555..5ced61e 100644
--- a/drivers/tty/serial/imx.c
+++ b/drivers/tty/serial/imx.c
-@@ -734,6 +734,7 @@ static irqreturn_t imx_int(int irq, void *dev_id)
+@@ -753,6 +753,7 @@ static irqreturn_t imx_int(int irq, void
struct imx_port *sport = dev_id;
unsigned int sts;
unsigned int sts2;
@@ -28,7 +26,7 @@ index bfc4555..5ced61e 100644
sts = readl(sport->port.membase + USR1);
sts2 = readl(sport->port.membase + USR2);
-@@ -743,26 +744,34 @@ static irqreturn_t imx_int(int irq, void *dev_id)
+@@ -762,26 +763,34 @@ static irqreturn_t imx_int(int irq, void
imx_dma_rxint(sport);
else
imx_rxint(irq, dev_id);
@@ -67,6 +65,3 @@ index bfc4555..5ced61e 100644
}
/*
---
-1.9.1
-