| Message ID | 20230601105548.29965-1-steven.price@arm.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | serial: core: Don't drop port_mutex in serial_core_remove_one_port | expand |
* Steven Price <steven.price@arm.com> [230601 10:56]: > Commit 84a9582fd203 ("serial: core: Start managing serial controllers to > enable runtime PM") required the caller to hold port_mutex rather than > taking it locally. However the mutex_unlock() call wasn't removed > causing the mutex to be dropped unexpectly. Remove the call to > mutex_unlock() (and fix up the early return) to restore correct > behaviour. > > Fixes: 84a9582fd203 ("serial: core: Start managing serial controllers to enable runtime PM") Reviewed-by: Tony Lindgren <tony@atomide.com>
diff --git a/drivers/tty/serial/serial_core.c b/drivers/tty/serial/serial_core.c index 29bd5ede0b25..efda90215ee9 100644 --- a/drivers/tty/serial/serial_core.c +++ b/drivers/tty/serial/serial_core.c @@ -3194,7 +3194,7 @@ static void serial_core_remove_one_port(struct uart_driver *drv, if (!uart_port) { mutex_unlock(&port->mutex); - goto out; + return; } mutex_unlock(&port->mutex); @@ -3234,8 +3234,6 @@ static void serial_core_remove_one_port(struct uart_driver *drv, wait_event(state->remove_wait, !atomic_read(&state->refcount)); state->uart_port = NULL; mutex_unlock(&port->mutex); -out: - mutex_unlock(&port_mutex); } /**
Commit 84a9582fd203 ("serial: core: Start managing serial controllers to enable runtime PM") required the caller to hold port_mutex rather than taking it locally. However the mutex_unlock() call wasn't removed causing the mutex to be dropped unexpectly. Remove the call to mutex_unlock() (and fix up the early return) to restore correct behaviour. Fixes: 84a9582fd203 ("serial: core: Start managing serial controllers to enable runtime PM") Signed-off-by: Steven Price <steven.price@arm.com> --- drivers/tty/serial/serial_core.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-)