summaryrefslogtreecommitdiffstats
path: root/drivers/tty
diff options
context:
space:
mode:
authorAlexander Sverdlin <alexander.sverdlin@nokia.com>2018-07-13 16:58:54 +0200
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2018-09-26 08:39:38 +0200
commit24d7347116baec6f515601891717a692e6d41e8d (patch)
treeeacea1ebda36e76a33bc8cc6920dba8d890ab1de /drivers/tty
parentcc04d14157b8abcba1ed4eca41da3361a02d2472 (diff)
downloadlinux-stable-24d7347116baec6f515601891717a692e6d41e8d.tar.gz
linux-stable-24d7347116baec6f515601891717a692e6d41e8d.tar.bz2
linux-stable-24d7347116baec6f515601891717a692e6d41e8d.zip
serial: 8250: of: Correct of_platform_serial_setup() error handling
[ Upstream commit b29330d829042512fabb2bfa3bbfa32df1115594 ] Don't dispose IRQ mapping before it has been created. Fixes: aa9594740 ("serial: 8250_of: Add IO space support") Signed-off-by: Alexander Sverdlin <alexander.sverdlin@nokia.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> Signed-off-by: Sasha Levin <alexander.levin@microsoft.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/tty')
-rw-r--r--drivers/tty/serial/8250/8250_of.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/tty/serial/8250/8250_of.c b/drivers/tty/serial/8250/8250_of.c
index bfb37f0be22f..863e86b9a424 100644
--- a/drivers/tty/serial/8250/8250_of.c
+++ b/drivers/tty/serial/8250/8250_of.c
@@ -124,7 +124,7 @@ static int of_platform_serial_setup(struct platform_device *ofdev,
dev_warn(&ofdev->dev, "unsupported reg-io-width (%d)\n",
prop);
ret = -EINVAL;
- goto err_dispose;
+ goto err_unprepare;
}
}
port->flags |= UPF_IOREMAP;