diff --git a/[refs] b/[refs] index 35b5c40120a2..a85038a5dc90 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 2920adb6dfeded0b835a809a1a2c5772d97e5965 +refs/heads/master: b88d0826ecb949f62597d4733e50e589058c20b4 diff --git a/trunk/drivers/tty/serial/8250/8250_dw.c b/trunk/drivers/tty/serial/8250/8250_dw.c index b7c7d6a6cad7..39b7ae465b5a 100644 --- a/trunk/drivers/tty/serial/8250/8250_dw.c +++ b/trunk/drivers/tty/serial/8250/8250_dw.c @@ -250,7 +250,8 @@ static int dw8250_probe(struct platform_device *pdev) 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)); + uart.port.membase = devm_ioremap(&pdev->dev, regs->start, + resource_size(regs)); if (!uart.port.membase) return -ENOMEM;