From: Martin Schwidefsky <schwidefsky@de.ibm.com>
Date: Tue, 15 Oct 2013 11:41:05 +0000 (+0200)
Subject: s390/3270: use diagnose 0x210 for device sensing under z/VM
X-Git-Tag: MMI-PSA29.97-13-9~13360^2~20
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=01a7cfa24afd8e18ce691d3c2f1e1f093cf3a900;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git

s390/3270: use diagnose 0x210 for device sensing under z/VM

There is a debugging leftover from git commit 4d334fd155b53adf
"s390/3270: asynchronous size sensing" in raw3270_reset_device_cb.
Under z/VM the diagnose 0x210 can be used to find the correct
size of the 3270 terminal.

Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
---

diff --git a/drivers/s390/char/raw3270.c b/drivers/s390/char/raw3270.c
index c90ae6a6b8b5..2cdec21e8924 100644
--- a/drivers/s390/char/raw3270.c
+++ b/drivers/s390/char/raw3270.c
@@ -618,7 +618,7 @@ raw3270_reset_device_cb(struct raw3270_request *rq, void *data)
 	if (rq->rc) {
 		/* Reset command failed. */
 		rp->state = RAW3270_STATE_INIT;
-	} else if (0 && MACHINE_IS_VM) {
+	} else if (MACHINE_IS_VM) {
 		raw3270_size_device_vm(rp);
 		raw3270_size_device_done(rp);
 	} else