Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9111e788 authored by Ursula Braun's avatar Ursula Braun Committed by David S. Miller
Browse files

s390/qeth: handle sysfs error during initialization 



When setting up the device from within the layer discipline's
probe routine, creating the layer-specific sysfs attributes can fail.
Report this error back to the caller, and handle it by
releasing the layer discipline.

Signed-off-by: default avatarUrsula Braun <ubraun@linux.vnet.ibm.com>
[jwi: updated commit msg, moved an OSN change to a subsequent patch]
Signed-off-by: default avatarJulian Wiedmann <jwi@linux.vnet.ibm.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent b6016166

drivers/s390/net/qeth_core_main.c

+3 −1
Original line number Diff line number Diff line
@@ -5731,9 +5731,11 @@ static int qeth_core_set_online(struct ccwgroup_device *gdev) 
		if (rc)

			goto err;

		rc = card->discipline->setup(card->gdev);

		if (rc)

		if (rc) {

			qeth_core_free_discipline(card);

			goto err;

		}

	}

	rc = card->discipline->set_online(gdev);

err:

	return rc;

drivers/s390/net/qeth_core_sys.c

+2 −0
Original line number Diff line number Diff line
@@ -426,6 +426,8 @@ static ssize_t qeth_dev_layer2_store(struct device *dev, 
		goto out;



	rc = card->discipline->setup(card->gdev);

	if (rc)

		qeth_core_free_discipline(card);

out:

	mutex_unlock(&card->discipline_mutex);

	return rc ? rc : count;

drivers/s390/net/qeth_l2_main.c

+4 −1
Original line number Diff line number Diff line
@@ -883,8 +883,11 @@ static int qeth_l2_stop(struct net_device *dev) 
static int qeth_l2_probe_device(struct ccwgroup_device *gdev)

{

	struct qeth_card *card = dev_get_drvdata(&gdev->dev);

	int rc;



	qeth_l2_create_device_attributes(&gdev->dev);

	rc = qeth_l2_create_device_attributes(&gdev->dev);

	if (rc)

		return rc;

	INIT_LIST_HEAD(&card->vid_list);

	hash_init(card->mac_htable);

	card->options.layer2 = 1;

drivers/s390/net/qeth_l3_main.c

+4 −1
Original line number Diff line number Diff line
@@ -3039,8 +3039,11 @@ static int qeth_l3_setup_netdev(struct qeth_card *card) 
static int qeth_l3_probe_device(struct ccwgroup_device *gdev)

{

	struct qeth_card *card = dev_get_drvdata(&gdev->dev);

	int rc;



	qeth_l3_create_device_attributes(&gdev->dev);

	rc = qeth_l3_create_device_attributes(&gdev->dev);

	if (rc)

		return rc;

	card->options.layer2 = 0;

	card->info.hwtrap = 0;

	return 0;