diff options
| author | David S. Miller <davem@davemloft.net> | 2020-05-13 12:14:51 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2020-05-13 12:14:51 -0700 |
| commit | f3fbc5a38021637aa959a04239d7ef921a7336bc (patch) | |
| tree | a37c5c995dea5ce42841da432bc1b2aac76c4874 | |
| parent | eead1c2ea2509fd754c6da893a94f0e69e83ebe4 (diff) | |
| parent | be7fa20f057e05b31fc08d1999394c43cf2c1a9a (diff) | |
| download | linux-f3fbc5a38021637aa959a04239d7ef921a7336bc.tar.gz | |
Merge branch 's390-fixes'
Ursula Braun says:
====================
s390/net: updates 2020-05-13
please apply the fix from Wei Yongjun to netdev's net tree and
add Karsten Graul as co-maintainer for drivers/s390/net.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | MAINTAINERS | 1 | ||||
| -rw-r--r-- | drivers/s390/net/ism_drv.c | 4 |
2 files changed, 4 insertions, 1 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 88bf36ab2b22ac..85894787825e17 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -14644,6 +14644,7 @@ F: drivers/iommu/s390-iommu.c S390 IUCV NETWORK LAYER M: Julian Wiedmann <jwi@linux.ibm.com> +M: Karsten Graul <kgraul@linux.ibm.com> M: Ursula Braun <ubraun@linux.ibm.com> L: linux-s390@vger.kernel.org S: Supported diff --git a/drivers/s390/net/ism_drv.c b/drivers/s390/net/ism_drv.c index c75112ee7b97af..c7fade836d833f 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); |