Commit c6f7f898 authored by Andrew Morton's avatar Andrew Morton Committed by Linus Torvalds

[PATCH] s390: 3270 device driver.

From: Martin Schwidefsky <schwidefsky@de.ibm.com>

3270 device driver changes:
 - Add NULL pointer checks.
parent 3b1e2468
...@@ -381,6 +381,8 @@ raw3270_irq (struct ccw_device *cdev, unsigned long intparm, struct irb *irb) ...@@ -381,6 +381,8 @@ raw3270_irq (struct ccw_device *cdev, unsigned long intparm, struct irb *irb)
return; /* Sucessfully restarted. */ return; /* Sucessfully restarted. */
break; break;
case RAW3270_IO_STOP: case RAW3270_IO_STOP:
if (!rq)
break;
raw3270_halt_io_nolock(rp, rq); raw3270_halt_io_nolock(rp, rq);
rq->rc = -EIO; rq->rc = -EIO;
break; break;
...@@ -881,7 +883,7 @@ raw3270_activate_view(struct raw3270_view *view) ...@@ -881,7 +883,7 @@ raw3270_activate_view(struct raw3270_view *view)
if (rc) { if (rc) {
/* Didn't work. Try to reactivate the old view. */ /* Didn't work. Try to reactivate the old view. */
rp->view = oldview; 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. */ /* Didn't work as well. Try any other view. */
list_for_each_entry(nv, &rp->view_list, list) list_for_each_entry(nv, &rp->view_list, list)
if (nv != view && nv != oldview) { if (nv != view && nv != oldview) {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment