From eb2744bb5eace92813c7a9fc7aec8957d8eaf5e4 Mon Sep 17 00:00:00 2001 From: Heikki Krogerus Date: Thu, 10 Jan 2013 11:25:07 +0200 Subject: [PATCH] --- yaml --- r: 354790 b: refs/heads/master c: f93366ff9ac282fc01effe70df0dd84418f8344e h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/tty/serial/8250/8250_dw.c | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index e64c9d99885e..508c118e8b15 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 966c4e39b5f7f249d7bb4c409176c9e6c5d48025 +refs/heads/master: f93366ff9ac282fc01effe70df0dd84418f8344e diff --git a/trunk/drivers/tty/serial/8250/8250_dw.c b/trunk/drivers/tty/serial/8250/8250_dw.c index ff83ea518760..e1749012e8e3 100644 --- a/trunk/drivers/tty/serial/8250/8250_dw.c +++ b/trunk/drivers/tty/serial/8250/8250_dw.c @@ -111,10 +111,13 @@ static int dw8250_probe(struct platform_device *pdev) uart.port.irq = irq->start; uart.port.handle_irq = dw8250_handle_irq; uart.port.type = PORT_8250; - uart.port.flags = UPF_SHARE_IRQ | UPF_BOOT_AUTOCONF | UPF_IOREMAP | - UPF_FIXED_PORT; + uart.port.flags = UPF_SHARE_IRQ | UPF_BOOT_AUTOCONF | UPF_FIXED_PORT; uart.port.dev = &pdev->dev; + uart.port.membase = ioremap(regs->start, resource_size(regs)); + if (!uart.port.membase) + return -ENOMEM; + uart.port.iotype = UPIO_MEM; uart.port.serial_in = dw8250_serial_in; uart.port.serial_out = dw8250_serial_out;