]> git.proxmox.com Git - mirror_ubuntu-focal-kernel.git/commitdiff
s390/ism: fix error return code in ism_probe()
authorWei Yongjun <weiyongjun1@huawei.com>
Wed, 13 May 2020 07:42:29 +0000 (09:42 +0200)
committerMarcelo Henrique Cerri <marcelo.cerri@canonical.com>
Mon, 22 Jun 2020 20:21:57 +0000 (17:21 -0300)
BugLink: https://bugs.launchpad.net/bugs/1879759
[ 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>
Signed-off-by: Kamal Mostafa <kamal@canonical.com>
Signed-off-by: Khalid Elmously <khalid.elmously@canonical.com>
drivers/s390/net/ism_drv.c

index 4fc2056bd2272b2607d4d6a89c73b0e91c7c9015..e615dc240150b4f28fc9a5d2f029dc7ad74bbabe 100644 (file)
@@ -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);