diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2015-10-12 10:54:35 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2015-10-12 10:54:35 -0700 |
| commit | 378102f364d3fba88b8162df13d639d620e9272c (patch) | |
| tree | 4d08ab65dc1e99d47c1b53fb7d7640711ea46cf6 /drivers/tty/serial/atmel_serial.c | |
| parent | 1a76eb5b04062cf2a32d5c7f0aefc9d92c3f986a (diff) | |
| parent | 25cb62b76430a91cc6195f902e61c2cb84ade622 (diff) | |
| download | linux-stable-378102f364d3fba88b8162df13d639d620e9272c.tar.gz linux-stable-378102f364d3fba88b8162df13d639d620e9272c.tar.bz2 linux-stable-378102f364d3fba88b8162df13d639d620e9272c.zip | |
Merge 4.3-rc5 into tty-next
We want the tty fixes and reverts in here as well so that people can
properly test and use it.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/tty/serial/atmel_serial.c')
| -rw-r--r-- | drivers/tty/serial/atmel_serial.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/tty/serial/atmel_serial.c b/drivers/tty/serial/atmel_serial.c index 90900263ca6c..298cbe34af45 100644 --- a/drivers/tty/serial/atmel_serial.c +++ b/drivers/tty/serial/atmel_serial.c @@ -2792,7 +2792,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); |