diff options
| author | Wei Yongjun <weiyongjun1@huawei.com> | 2020-05-13 09:42:29 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2020-05-20 08:20:26 +0200 |
| commit | 46a22f3ea146648288ee71fd42bcd2629405e9f4 (patch) | |
| tree | 7243e3a682fa453623151c43bbf01595c1ac02b0 /drivers | |
| parent | e1608af170301d018f2501f45821e577c253f32d (diff) | |
| download | linux-stable-46a22f3ea146648288ee71fd42bcd2629405e9f4.tar.gz linux-stable-46a22f3ea146648288ee71fd42bcd2629405e9f4.tar.bz2 linux-stable-46a22f3ea146648288ee71fd42bcd2629405e9f4.zip | |
s390/ism: fix error return code in ism_probe()
[ 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>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/s390/net/ism_drv.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/s390/net/ism_drv.c b/drivers/s390/net/ism_drv.c index 4fc2056bd227..e615dc240150 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); |