projects
/
openwrt
/
openwrt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
kernel: update kernel 3.18 to version 3.18.43
[openwrt/openwrt.git]
/
target
/
linux
/
ixp4xx
/
patches-3.18
/
160-delayed_uart_io.patch
diff --git
a/target/linux/ixp4xx/patches-3.18/160-delayed_uart_io.patch
b/target/linux/ixp4xx/patches-3.18/160-delayed_uart_io.patch
index 54dc905468da91739c929d3e3a22f72aba67b867..4207e67a6fa090244bd84d6801267665a6f7fb20 100644
(file)
--- a/
target/linux/ixp4xx/patches-3.18/160-delayed_uart_io.patch
+++ b/
target/linux/ixp4xx/patches-3.18/160-delayed_uart_io.patch
@@
-41,7
+41,7
@@
case UPIO_AU:
p->serial_out(p, offset, value);
p->serial_in(p, UART_LCR); /* safe, no side-effects */
case UPIO_AU:
p->serial_out(p, offset, value);
p->serial_in(p, UART_LCR); /* safe, no side-effects */
-@@ -26
55,6 +2675
,7 @@ static int serial8250_request_std_resour
+@@ -26
49,6 +2669
,7 @@ static int serial8250_request_std_resour
case UPIO_TSI:
case UPIO_MEM32:
case UPIO_MEM:
case UPIO_TSI:
case UPIO_MEM32:
case UPIO_MEM:
@@
-49,7
+49,7
@@
if (!port->mapbase)
break;
if (!port->mapbase)
break;
-@@ -26
91,6 +2712
,7 @@ static void serial8250_release_std_resou
+@@ -26
85,6 +2706
,7 @@ static void serial8250_release_std_resou
case UPIO_TSI:
case UPIO_MEM32:
case UPIO_MEM:
case UPIO_TSI:
case UPIO_MEM32:
case UPIO_MEM:
@@
-57,7
+57,7
@@
if (!port->mapbase)
break;
if (!port->mapbase)
break;
-@@ -34
24,6 +3446
,7 @@ static int serial8250_probe(struct platf
+@@ -34
18,6 +3440
,7 @@ static int serial8250_probe(struct platf
uart.port.set_termios = p->set_termios;
uart.port.pm = p->pm;
uart.port.dev = &dev->dev;
uart.port.set_termios = p->set_termios;
uart.port.pm = p->pm;
uart.port.dev = &dev->dev;
@@
-65,7
+65,7
@@
uart.port.irqflags |= irqflag;
ret = serial8250_register_8250_port(&uart);
if (ret < 0) {
uart.port.irqflags |= irqflag;
ret = serial8250_register_8250_port(&uart);
if (ret < 0) {
-@@ -35
80,6 +3603
,7 @@ int serial8250_register_8250_port(struct
+@@ -35
74,6 +3597
,7 @@ int serial8250_register_8250_port(struct
uart->port.flags = up->port.flags | UPF_BOOT_AUTOCONF;
uart->bugs = up->bugs;
uart->port.mapbase = up->port.mapbase;
uart->port.flags = up->port.flags | UPF_BOOT_AUTOCONF;
uart->bugs = up->bugs;
uart->port.mapbase = up->port.mapbase;