Commit f3fbc5a3 authored by David S. Miller's avatar David S. Miller

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: default avatarDavid S. Miller <davem@davemloft.net>
parents eead1c2e be7fa20f
...@@ -14644,6 +14644,7 @@ F: drivers/iommu/s390-iommu.c ...@@ -14644,6 +14644,7 @@ F: drivers/iommu/s390-iommu.c
S390 IUCV NETWORK LAYER S390 IUCV NETWORK LAYER
M: Julian Wiedmann <jwi@linux.ibm.com> M: Julian Wiedmann <jwi@linux.ibm.com>
M: Karsten Graul <kgraul@linux.ibm.com>
M: Ursula Braun <ubraun@linux.ibm.com> M: Ursula Braun <ubraun@linux.ibm.com>
L: linux-s390@vger.kernel.org L: linux-s390@vger.kernel.org
S: Supported S: Supported
......
...@@ -521,8 +521,10 @@ static int ism_probe(struct pci_dev *pdev, const struct pci_device_id *id) ...@@ -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->smcd = smcd_alloc_dev(&pdev->dev, dev_name(&pdev->dev), &ism_ops,
ISM_NR_DMBS); ISM_NR_DMBS);
if (!ism->smcd) if (!ism->smcd) {
ret = -ENOMEM;
goto err_resource; goto err_resource;
}
ism->smcd->priv = ism; ism->smcd->priv = ism;
ret = ism_dev_init(ism); ret = ism_dev_init(ism);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment