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

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

[S390] cio: css_probe_device() must be called enabled. 



Move css_probe_device() behind giving up the lock for the old subchannel
in css_evaluate_known_subchannel() so we aren't disabled when we call it.

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

drivers/s390/cio/css.c

+3 −4
Original line number Diff line number Diff line
@@ -271,10 +271,6 @@ static int css_evaluate_known_subchannel(struct subchannel *sch, int slow) 
		/* Reset intparm to zeroes. */

		sch->schib.pmcw.intparm = 0;

		cio_modify(sch);



		/* Probe if necessary. */

		if (action == UNREGISTER_PROBE)

			ret = css_probe_device(sch->schid);

		break;

	case REPROBE:

		device_trigger_reprobe(sch);
@@ -283,6 +279,9 @@ static int css_evaluate_known_subchannel(struct subchannel *sch, int slow) 
		break;

	}

	spin_unlock_irqrestore(&sch->lock, flags);

	/* Probe if necessary. */

	if (action == UNREGISTER_PROBE)

		ret = css_probe_device(sch->schid);



	return ret;

}