[PATCH AUTOSEL 4.18 35/92] serial: 8250: of: Correct of_platform_serial_setup() error handling

[Sasha Levin]

From: Alexander Sverdlin <alexander.sverd...@nokia.com>

[ 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.sverd...@nokia.com>
Signed-off-by: Greg Kroah-Hartman <gre...@linuxfoundation.org>
Signed-off-by: Sasha Levin <alexander.le...@microsoft.com>
---
 drivers/tty/serial/8250/8250_of.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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;
-- 
2.17.1