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

Commit e427babe authored by Klaus-Dieter Wacker's avatar Klaus-Dieter Wacker Committed by David S. Miller
Browse files

lcs: Return zero from ccwgroup devs set_offline function 



A return code of non-zero of the devs ccwgroup set_offline function
leaves the dev in online state. Having done a partly offlining
may leave the dev in unusable state. To make sure the dev is set to
offline, zero is returned. A setup trace entry is written in case
the offlining steps encountered some trouble.

Signed-off-by: default avatarKlaus-Dieter Wacker <kdwacker@de.ibm.com>
Signed-off-by: default avatarFrank Blaschka <frank.blaschka@de.ibm.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent e0a8114c

drivers/s390/net/lcs.c

+7 −5
Original line number Diff line number Diff line
@@ -2240,7 +2240,7 @@ __lcs_shutdown_device(struct ccwgroup_device *ccwgdev, int recovery_mode) 
{

	struct lcs_card *card;

	enum lcs_dev_states recover_state;

	int ret;

	int ret = 0, ret2 = 0, ret3 = 0;



	LCS_DBF_TEXT(3, setup, "shtdndev");

	card = dev_get_drvdata(&ccwgdev->dev);
@@ -2255,13 +2255,15 @@ __lcs_shutdown_device(struct ccwgroup_device *ccwgdev, int recovery_mode) 
	recover_state = card->state;



	ret = lcs_stop_device(card->dev);

	ret = ccw_device_set_offline(card->read.ccwdev);

	ret = ccw_device_set_offline(card->write.ccwdev);

	ret2 = ccw_device_set_offline(card->read.ccwdev);

	ret3 = ccw_device_set_offline(card->write.ccwdev);

	if (!ret)

		ret = (ret2) ? ret2 : ret3;

	if (ret)

		LCS_DBF_TEXT_(3, setup, "1err:%d", ret);

	if (recover_state == DEV_STATE_UP) {

		card->state = DEV_STATE_RECOVER;

	}

	if (ret)

		return ret;

	return 0;

}