2004-04-21 14:51:24

by Martin Schwidefsky

[permalink] [raw]
Subject: [PATCH] s390 (3/9): 3270 device driver.

[PATCH] s390: 3270 device driver.

From: Martin Schwidefsky <[email protected]>

3270 device driver changes:
- Add NULL pointer checks.

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

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 Sun Apr 4 05:37:45 2004
+++ linux-2.6-s390/drivers/s390/char/raw3270.c Wed Apr 21 16:29:36 2004
@@ -381,6 +381,8 @@
return; /* Sucessfully restarted. */
break;
case RAW3270_IO_STOP:
+ if (!rq)
+ break;
raw3270_halt_io_nolock(rp, rq);
rq->rc = -EIO;
break;
@@ -881,7 +883,7 @@
if (rc) {
/* Didn't work. Try to reactivate the old view. */
rp->view = oldview;
- if (oldview->fn->activate(oldview) != 0) {
+ if (!oldview || oldview->fn->activate(oldview) != 0) {
/* Didn't work as well. Try any other view. */
list_for_each_entry(nv, &rp->view_list, list)
if (nv != view && nv != oldview) {