From 022ea266e0df9e4e7da4a210590e4f76af23587a Mon Sep 17 00:00:00 2001
From: Jan Glauber <jang@linux.vnet.ibm.com>
Date: Thu, 21 Aug 2008 19:46:33 +0200
Subject: [PATCH] --- yaml --- r: 108958 b: refs/heads/master c:
 53b41ba7ce4563c33a0449fbcbbd70665477d654 h: refs/heads/master v: v3

---
 [refs]                                | 2 +-
 trunk/drivers/s390/cio/qdio_thinint.c | 6 +++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 1a71440eb267..2f51841ffc17 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8853e505a15f31fe608cb50e038ba2f794eed923
+refs/heads/master: 53b41ba7ce4563c33a0449fbcbbd70665477d654
diff --git a/trunk/drivers/s390/cio/qdio_thinint.c b/trunk/drivers/s390/cio/qdio_thinint.c
index 9291a771d812..ea7f61400267 100644
--- a/trunk/drivers/s390/cio/qdio_thinint.c
+++ b/trunk/drivers/s390/cio/qdio_thinint.c
@@ -113,7 +113,11 @@ void tiqdio_remove_input_queues(struct qdio_irq *irq_ptr)
 	struct qdio_q *q;
 	int i;
 
-	for_each_input_queue(irq_ptr, q, i) {
+	for (i = 0; i < irq_ptr->nr_input_qs; i++) {
+		q = irq_ptr->input_qs[i];
+		/* if establish triggered an error */
+		if (!q || !q->entry.prev || !q->entry.next)
+			continue;
 		list_del_rcu(&q->entry);
 		synchronize_rcu();
 	}