Merge tag 'keys-next-fixes-20150114' of git://git.kernel.org/pub/scm/linux/kernel...

[firefly-linux-kernel-4.4.55.git] / drivers / tty / serial / lantiq.c

diff --git a/drivers/tty/serial/lantiq.c b/drivers/tty/serial/lantiq.c
index 4675fe198d31a625498dc43dfd0dfea72ed7faad..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;
        }
 }
@@ -743,7 +745,6 @@ MODULE_DEVICE_TABLE(of, ltq_asc_match);
 static struct platform_driver lqasc_driver = {
        .driver         = {
                .name   = DRVNAME,
-               .owner  = THIS_MODULE,
                .of_match_table = ltq_asc_match,
        },
 };