| From 01100d690dc66ec4ecba80ec8e4223817d65e167 Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Wed, 13 May 2020 09:42:29 +0200 |
| Subject: s390/ism: fix error return code in ism_probe() |
| |
| From: Wei Yongjun <weiyongjun1@huawei.com> |
| |
| [ Upstream commit 29b74cb75e3572d83708745e81e24d37837415f9 ] |
| |
| Fix to return negative error code -ENOMEM from the smcd_alloc_dev() |
| error handling case instead of 0, as done elsewhere in this function. |
| |
| Fixes: 684b89bc39ce ("s390/ism: add device driver for internal shared memory") |
| Reported-by: Hulk Robot <hulkci@huawei.com> |
| Signed-off-by: Wei Yongjun <weiyongjun1@huawei.com> |
| Signed-off-by: Ursula Braun <ubraun@linux.ibm.com> |
| Signed-off-by: David S. Miller <davem@davemloft.net> |
| Signed-off-by: Sasha Levin <sashal@kernel.org> |
| --- |
| drivers/s390/net/ism_drv.c | 4 +++- |
| 1 file changed, 3 insertions(+), 1 deletion(-) |
| |
| diff --git a/drivers/s390/net/ism_drv.c b/drivers/s390/net/ism_drv.c |
| index 4fc2056bd2272..e615dc240150b 100644 |
| --- a/drivers/s390/net/ism_drv.c |
| +++ b/drivers/s390/net/ism_drv.c |
| @@ -521,8 +521,10 @@ static int ism_probe(struct pci_dev *pdev, const struct pci_device_id *id) |
| |
| ism->smcd = smcd_alloc_dev(&pdev->dev, dev_name(&pdev->dev), &ism_ops, |
| ISM_NR_DMBS); |
| - if (!ism->smcd) |
| + if (!ism->smcd) { |
| + ret = -ENOMEM; |
| goto err_resource; |
| + } |
| |
| ism->smcd->priv = ism; |
| ret = ism_dev_init(ism); |
| -- |
| 2.20.1 |
| |