| Message ID | 1418347676-5422-1-git-send-email-siew.hoon.lim@intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
diff --git a/drivers/tty/serial/8250/8250_dw.c b/drivers/tty/serial/8250/8250_dw.c index a278d1d..2c05c46 100644 --- a/drivers/tty/serial/8250/8250_dw.c +++ b/drivers/tty/serial/8250/8250_dw.c @@ -153,6 +153,7 @@ static unsigned int dw8250_serial_in32(struct uart_port *p, int offset) static int dw8250_handle_irq(struct uart_port *p) { unsigned int iir = p->serial_in(p, UART_IIR); + struct dw8250_data *d = p->private_data; if (serial8250_handle_irq(p, iir)) { return 1;
Fixed the compilation error 'd' undeclared. Introduced by commit id: 1e6d1ee7d3aa94cd [Geert Uytterhoeven comment] The use of 'd->usr_reg' was added by: origin/3.10-ltsi:patches.baytrail/1148-tty-8250_dw-Add-support-for-OCTEON-UARTS.patch Upstream commit d5f1af7ece96cf52 ("tty/8250_dw: Add support for OCTEON UARTS.") Why don't we have the local variable 'd'? Because it was removed by commit 6d5e793314178861 ("serial: 8250_dw: Improve unwritable LCR workaround"), probably to fix a compiler warning: [wangnan: backport to 3.10.43: - adjust context - remove unneeded local var] Signed-off-by: Wang Nan <wangnan0 at huawei.com> So it looks like d5f1af7ece96cf52 was a prerequisite for 6d5e793314178861, while v3.10.48 only got a modified version of the latter, and 3.10-ltsi got the former afterwards, breaking the build. Signed-off-by: Lim Siew Hoon <siew.hoon.lim@intel.com> --- drivers/tty/serial/8250/8250_dw.c | 1 + 1 file changed, 1 insertion(+)