aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/tty
diff options
context:
space:
mode:
authorWei Yongjun <weiyongjun1@huawei.com>2018-09-25 14:23:21 +0000
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2018-10-02 13:38:58 -0700
commit823f4e53f0f2beef4ae43b0a8b33e27b0761b840 (patch)
tree221d797c1ea5bc9f9afb0db3c113c0b704c44dc2 /drivers/tty
parenttty/serial: atmel: add ISO7816 support (diff)
downloadlinux-dev-823f4e53f0f2beef4ae43b0a8b33e27b0761b840.tar.xz
linux-dev-823f4e53f0f2beef4ae43b0a8b33e27b0761b840.zip
serial: uartps: Fix missing unlock on error in cdns_get_id()
Add the missing unlock before return from function cdns_get_id() in the error handling case. Fixes: ae1cca3fa347 ("serial: uartps: Change uart ID port allocation") Signed-off-by: Wei Yongjun <weiyongjun1@huawei.com> Reviewed-by: Michal Simek <michal.simek@xilinx.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/tty')
-rw-r--r--drivers/tty/serial/xilinx_uartps.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/tty/serial/xilinx_uartps.c b/drivers/tty/serial/xilinx_uartps.c
index f77200a0f461..0e3dae461f71 100644
--- a/drivers/tty/serial/xilinx_uartps.c
+++ b/drivers/tty/serial/xilinx_uartps.c
@@ -1394,8 +1394,10 @@ static int cdns_get_id(struct platform_device *pdev)
if (!alias_bitmap_initialized) {
ret = of_alias_get_alias_list(cdns_uart_of_match, "serial",
alias_bitmap, MAX_UART_INSTANCES);
- if (ret)
+ if (ret) {
+ mutex_unlock(&bitmap_lock);
return ret;
+ }
alias_bitmap_initialized++;
}