Merge tag 'driver-core-3.19-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git...

[linux-2.6-block.git] / drivers / tty / serial / lantiq.c

diff --git a/drivers/tty/serial/lantiq.c b/drivers/tty/serial/lantiq.c
index 6c10a9089f3bf1d848622c118dd115d55fad2e7f..4ccc0397664cad0a244d74195b2cc0950631b359 100644 (file)
--- a/drivers/tty/serial/lantiq.c
+++ b/drivers/tty/serial/lantiq.c
@@ -497,8 +497,10 @@ lqasc_type(struct uart_port *port)
 static void
 lqasc_release_port(struct uart_port *port)
 {
+       struct platform_device *pdev = to_platform_device(port->dev);
+
        if (port->flags & UPF_IOREMAP) {
-               iounmap(port->membase);
+               devm_iounmap(&pdev->dev, port->membase);
                port->membase = NULL;
        }
 }