summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWei Yongjun <weiyongjun1@huawei.com>2020-04-27 12:24:15 +0000
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2020-10-01 13:14:43 +0200
commit5c8c4d83ef7038059c4be11b099e537598040e63 (patch)
treef8f13fb48650940cb02c13c8bfde7cb08f57da53
parentbbd1347bd4ad6e2fc79bed8f19b088abb42fb4b1 (diff)
downloadlinux-stable-5c8c4d83ef7038059c4be11b099e537598040e63.tar.gz
linux-stable-5c8c4d83ef7038059c4be11b099e537598040e63.tar.bz2
linux-stable-5c8c4d83ef7038059c4be11b099e537598040e63.zip
sparc64: vcc: Fix error return code in vcc_probe()
[ Upstream commit ff62255a2a5c1228a28f2bb063646f948115a309 ] Fix to return negative error code -ENOMEM from the error handling case instead of 0, as done elsewhere in this function. Signed-off-by: Wei Yongjun <weiyongjun1@huawei.com> Link: https://lore.kernel.org/r/20200427122415.47416-1-weiyongjun1@huawei.com Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> Signed-off-by: Sasha Levin <sashal@kernel.org>
-rw-r--r--drivers/tty/vcc.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/tty/vcc.c b/drivers/tty/vcc.c
index 58b454c34560..10a832a2135e 100644
--- a/drivers/tty/vcc.c
+++ b/drivers/tty/vcc.c
@@ -604,6 +604,7 @@ static int vcc_probe(struct vio_dev *vdev, const struct vio_device_id *id)
port->index = vcc_table_add(port);
if (port->index == -1) {
pr_err("VCC: no more TTY indices left for allocation\n");
+ rv = -ENOMEM;
goto free_ldc;
}