2004-04-28 19:44:50

by Martin Schwidefsky

[permalink] [raw]
Subject: [PATCH] s390 (4/6): 3270 console driver.

[PATCH] s390: 3270 driver.

From: Martin Schwidefsky <[email protected]>

3270 device driver change:
- Add missing irb error checking.

diffstat:
drivers/s390/char/raw3270.c | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)

diff -urN linux-2.6/drivers/s390/char/raw3270.c linux-2.6-s390/drivers/s390/char/raw3270.c
--- linux-2.6/drivers/s390/char/raw3270.c Wed Apr 28 17:51:15 2004
+++ linux-2.6-s390/drivers/s390/char/raw3270.c Wed Apr 28 17:51:39 2004
@@ -345,8 +345,10 @@
rq = (struct raw3270_request *) intparm;
view = rq ? rq->view : rp->view;

- if (irb->scsw.dstat ==
- (DEV_STAT_CHN_END | DEV_STAT_DEV_END | DEV_STAT_UNIT_EXCEP)) {
+ if (IS_ERR(irb))
+ rc = RAW3270_IO_RETRY;
+ else if (irb->scsw.dstat == (DEV_STAT_CHN_END | DEV_STAT_DEV_END |
+ DEV_STAT_UNIT_EXCEP)) {
/* Handle CE-DE-UE and subsequent UDE */
set_bit(RAW3270_FLAGS_BUSY, &rp->flags);
rc = RAW3270_IO_BUSY;