diff options
author | Julian Wiedmann <jwi@linux.ibm.com> | 2018-09-12 15:31:32 +0200 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2018-09-12 13:12:51 -0700 |
commit | 778b1ac737494cec156f17c80da44664c1f77cf6 (patch) | |
tree | 3c1e652c0526a694d3e4119ac61b9cb0effd9f0a /drivers/s390 | |
parent | cc4dfb7f70a344f24c1c71e298deea0771dadcb2 (diff) | |
download | linux-778b1ac737494cec156f17c80da44664c1f77cf6.tar.bz2 |
s390/qeth: indicate error when netdev allocation fails
Bailing out on allocation error is nice, but we also need to tell the
ccwgroup core that creating the qeth groupdev failed.
Fixes: d3d1b205e89f ("s390/qeth: allocate netdevice early")
Signed-off-by: Julian Wiedmann <jwi@linux.ibm.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/s390')
-rw-r--r-- | drivers/s390/net/qeth_core_main.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/s390/net/qeth_core_main.c b/drivers/s390/net/qeth_core_main.c index 49f64eb3eab0..6b24face21d5 100644 --- a/drivers/s390/net/qeth_core_main.c +++ b/drivers/s390/net/qeth_core_main.c @@ -5768,8 +5768,10 @@ static int qeth_core_probe_device(struct ccwgroup_device *gdev) qeth_update_from_chp_desc(card); card->dev = qeth_alloc_netdev(card); - if (!card->dev) + if (!card->dev) { + rc = -ENOMEM; goto err_card; + } qeth_determine_capabilities(card); enforced_disc = qeth_enforce_discipline(card); |