]> git.ipfire.org Git - thirdparty/kernel/stable.git/commit
tty/serial: at91: fix error handling in atmel_serial_probe()
authorCyrille Pitchen <cyrille.pitchen@atmel.com>
Tue, 9 Dec 2014 13:31:34 +0000 (14:31 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 6 Mar 2015 22:57:33 +0000 (14:57 -0800)
commitf047b326ceb5c86e0685a7a4f310856ccce899c9
treec4218a7b5b62c74b793b0e9a16e0b1cdcb1a3b1e
parent8155e4a095ba26d5e0204deb3f97aca2296fae5e
tty/serial: at91: fix error handling in atmel_serial_probe()

commit 6fbb9bdf0f3fbe23aeff806489791aa876adaffb upstream.

-EDEFER error wasn't handle properly by atmel_serial_probe().
As an example, when atmel_serial_probe() is called for the first time, we pass
the test_and_set_bit() test to check whether the port has already been
initalized. Then we call atmel_init_port(), which may return -EDEFER, possibly
returned before by clk_get(). Consequently atmel_serial_probe() used to return
this error code WITHOUT clearing the port bit in the "atmel_ports_in_use" mask.
When atmel_serial_probe() was called for the second time, it used to fail on
the test_and_set_bit() function then returning -EBUSY.

When atmel_serial_probe() fails, this patch make it clear the port bit in the
"atmel_ports_in_use" mask, if needed, before returning the error code.

Signed-off-by: Cyrille Pitchen <cyrille.pitchen@atmel.com>
Acked-by: Nicolas Ferre <nicolas.ferre@atmel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/tty/serial/atmel_serial.c