serial: atmel: fix error path of probe function

Uwe Kleine-König · gregkh · commit 8f1bd8f2ad23 · 2015-10-04T18:51:42.000+01:00
If atmel_init_gpios fails the port has already been marked as busy (in line 2629), so this must be undone in the error path. This bug was introduced because I created the patch that finally became 722ccf4 ("serial: atmel: fix error handling when mctrl_gpio_init fails") on top of 3.19 which didn't have commit 6fbb9bd ("tty/serial: at91: fix error handling in atmel_serial_probe()") yet. Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de> Fixes: 722ccf4 ("serial: atmel: fix error handling when mctrl_gpio_init fails") Acked-by: Nicolas Ferre <nicolas.ferre@atmel.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
diff --git a/drivers/tty/serial/atmel_serial.c b/drivers/tty/serial/atmel_serial.c
@@ -2786,7 +2786,7 @@ static int atmel_serial_probe(struct platform_device *pdev)
 	ret = atmel_init_gpios(port, &pdev->dev);
 	if (ret < 0) {
 		dev_err(&pdev->dev, "Failed to initialize GPIOs.");
-		goto err;
+		goto err_clear_bit;
 	}
 
 	ret = atmel_init_port(port, pdev);

Original file line number	Diff line number	Diff line change
`@@ -2786,7 +2786,7 @@ static int atmel_serial_probe(struct platform_device *pdev)`
`2786`	`2786`	`ret = atmel_init_gpios(port, &pdev->dev);`
`2787`	`2787`	`if (ret < 0) {`
`2788`	`2788`	`dev_err(&pdev->dev, "Failed to initialize GPIOs.");`
`2789`		`- goto err;`
	`2789`	`+ goto err_clear_bit;`
`2790`	`2790`	`}`
`2791`	`2791`
`2792`	`2792`	`ret = atmel_init_port(port, pdev);`