Skip to contentSkip to conversation

s390/net: updates 2020-05-13

PATCH In review Ursula Braun 2 participants 4 messages May 13, 2020

Subsystems (4)
lore
Share & tools
lore
#0 lore raw

cover s390/net: updates 2020-05-13

Dave,

please apply the fix from Wei Yongjun to netdev's net tree and add Karsten Graul as co-maintainer for drivers/s390/net.

Thanks, Ursula

Ursula Braun (1):
MAINTAINERS: add Karsten Graul as S390 NETWORK DRIVERS maintainer

Wei Yongjun (1):
s390/ism: fix error return code in ism_probe()

 MAINTAINERS                | 1 +
 drivers/s390/net/ism_drv.c | 4 +++-
 2 files changed, 4 insertions(+), 1 deletion(-)
Signature · 1 line
2.17.1
#1 lore raw

PATCH 1/2 s390/ism: fix error return code in ism_probe()

From: Wei Yongjun <[email protected]>

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")
---
 drivers/s390/net/ism_drv.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/s390/net/ism_drv.c +3 -1
index c75112ee7b97..c7fade836d83 100644
@@ -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);
Signature · 1 line
2.17.1
#2 lore raw

PATCH 2/2 MAINTAINERS: add Karsten Graul as S390 NETWORK DRIVERS maintainer

In reply to Ursula Braun

Add Karsten as additional maintainer for drivers/s390/net . One of his focal points is the ism driver.

---
 MAINTAINERS | 1 +
 1 file changed, 1 insertion(+)
MAINTAINERS +1 -0
index 88bf36ab2b22..85894787825e 100644
@@ -14644,6 +14644,7 @@ F:	drivers/iommu/s390-iommu.c
 
 S390 IUCV NETWORK LAYER
 M:	Julian Wiedmann <[email protected]>
+M:	Karsten Graul <[email protected]>
 M:	Ursula Braun <[email protected]>
 L:	[email protected]
 S:	Supported
Signature · 1 line
2.17.1
maintainer
#3 lore raw
In reply to Ursula Braun

From: Ursula Braun <[email protected]>
Date: Wed, 13 May 2020 09:42:28 +0200

Quoted 2 lines

please apply the fix from Wei Yongjun to netdev's net tree and add Karsten Graul as co-maintainer for drivers/s390/net.

Series applied, thanks.