Commit 3863e724 authored by Martin Schwidefsky's avatar Martin Schwidefsky Committed by Linus Torvalds
Browse files

[PATCH] s390: disconnected 3270 console 



Fix reboot with a disconnected 3270 console.

Signed-off-by: default avatarMartin Schwidefsky <schwidefsky@de.ibm.com>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 9513e5e3

drivers/s390/char/raw3270.c

+11 −5
Original line number Diff line number Diff line
@@ -632,12 +632,9 @@ __raw3270_size_device(struct raw3270 *rp) 
	raw3270_init_request.ccw.cda = (__u32) __pa(raw3270_init_data);



	rc = raw3270_start_init(rp, &raw3270_init_view, &raw3270_init_request);

	if (rc) {

	if (rc)

		/* Check error cases: -ERESTARTSYS, -EIO and -EOPNOTSUPP */

		if (rc == -EOPNOTSUPP && MACHINE_IS_VM)

			return __raw3270_size_device_vm(rp);

		return rc;

	}



	/* Wait for attention interrupt. */

#ifdef CONFIG_TN3270_CONSOLE
@@ -695,6 +692,9 @@ raw3270_size_device(struct raw3270 *rp) 
	down(&raw3270_init_sem);

	rp->view = &raw3270_init_view;

	raw3270_init_view.dev = rp;

	if (MACHINE_IS_VM)

		rc = __raw3270_size_device_vm(rp);

	else

		rc = __raw3270_size_device(rp);

	raw3270_init_view.dev = 0;

	rp->view = 0;
@@ -710,6 +710,12 @@ raw3270_size_device(struct raw3270 *rp) 
			rp->model = 4;

		if (rp->rows == 27 && rp->cols == 132)

			rp->model = 5;

	} else {

		/* Couldn't detect size. Use default model 2. */

		rp->model = 2;

		rp->rows = 24;

		rp->cols = 80;

		return 0;

	}

	return rc;

}