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

Commit 2470b648 authored by Cornelia Huck's avatar Cornelia Huck Committed by Martin Schwidefsky
Browse files

[S390] cio: Call cancel_halt_clear even when actl == 0. 



The subchannel may just be status pending, even with actl == 0. We
must go through the cancel_halt_clear procedure to put the subchannel
into a defined state.

Signed-off-by: default avatarCornelia Huck <cornelia.huck@de.ibm.com>
Signed-off-by: default avatarMartin Schwidefsky <schwidefsky@de.ibm.com>
parent 7c8427c3

drivers/s390/cio/device_fsm.c

+2 −2
Original line number Diff line number Diff line
@@ -144,8 +144,8 @@ ccw_device_cancel_halt_clear(struct ccw_device *cdev) 
	ret = stsch(sch->schid, &sch->schib);

	if (ret || !sch->schib.pmcw.dnv)

		return -ENODEV; 

	if (!sch->schib.pmcw.ena || sch->schib.scsw.actl == 0)

		/* Not operational or no activity -> done. */

	if (!sch->schib.pmcw.ena)

		/* Not operational -> done. */

		return 0;

	/* Stage 1: cancel io. */

	if (!(sch->schib.scsw.actl & SCSW_ACTL_HALT_PEND) &&