[patch 7/7] [PATCH] lcs: Return zero from ccwgroup devs set_offline function
From: <hidden>
Date: 2012-03-07 12:07:15
Also in:
linux-s390
From: Klaus-Dieter Wacker <redacted> 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: Klaus-Dieter Wacker <redacted> Signed-off-by: Frank Blaschka <redacted> --- drivers/s390/net/lcs.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff -urpN linux-2.6/drivers/s390/net/lcs.c linux-2.6-patched/drivers/s390/net/lcs.c
--- linux-2.6/drivers/s390/net/lcs.c 2012-01-05 00:55:44.000000000 +0100
+++ linux-2.6-patched/drivers/s390/net/lcs.c 2012-03-06 13:35:58.000000000 +0100@@ -2240,7 +2240,7 @@ __lcs_shutdown_device(struct ccwgroup_de { 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_de 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; }