summaryrefslogtreecommitdiffstats
path: root/drivers/tty/serial/mxs-auart.c
diff options
context:
space:
mode:
authorFabio Estevam2015-03-10 15:24:24 +0100
committerGreg Kroah-Hartman2015-03-11 13:55:20 +0100
commitac25e8c72b34ad7853aad0b7008633217af0c1df (patch)
tree3909ba307b87032bf64e590cfddc85fed4a8ba0d /drivers/tty/serial/mxs-auart.c
parentMerge 4.0-rc3 into tty-testing (diff)
downloadkernel-qcow2-linux-ac25e8c72b34ad7853aad0b7008633217af0c1df.tar.gz
kernel-qcow2-linux-ac25e8c72b34ad7853aad0b7008633217af0c1df.tar.xz
kernel-qcow2-linux-ac25e8c72b34ad7853aad0b7008633217af0c1df.zip
serial: mxs-auart: Fix build error
Commit 343fda95481a7254f ("serial: mxs-auart: properly handle mctrl_gpio failing") introduced the following build error: CC drivers/tty/serial/mxs-auart.o drivers/tty/serial/mxs-auart.c: In function 'mxs_auart_probe': drivers/tty/serial/mxs-auart.c:1282:3: error: unknown type name 'got' Fix it by providing a proper return code. Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com> Acked-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/tty/serial/mxs-auart.c')
-rw-r--r--drivers/tty/serial/mxs-auart.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/tty/serial/mxs-auart.c b/drivers/tty/serial/mxs-auart.c
index 9abdccf5bfb2..20a863bde78d 100644
--- a/drivers/tty/serial/mxs-auart.c
+++ b/drivers/tty/serial/mxs-auart.c
@@ -1279,7 +1279,7 @@ static int mxs_auart_probe(struct platform_device *pdev)
ret = mxs_auart_init_gpios(s, &pdev->dev);
if (ret) {
dev_err(&pdev->dev, "Failed to initialize GPIOs.\n");
- got out_free_irq;
+ return ret;
}
/*