From a726f8a607260fd8544a77c6f57123ea00b2e5ed Mon Sep 17 00:00:00 2001
From: Holger Dengler <hd@linux.vnet.ibm.com>
Date: Mon, 2 Jul 2012 12:39:59 +0200
Subject: [PATCH] --- yaml --- r: 313863 b: refs/heads/master c:
 8738e07d5c9b5b02f113c7e0ba67f0d8d6a5b23c h: refs/heads/master i:   313861:
 e6e37129534dc0a7da500458705cf67b9d191957   313859:
 d7a5662116eb54f2076cede830bc9be0565c3f7c   313855:
 f8425790ce936334648719ee8a49c77ccea9a2ce v: v3

---
 [refs]                             | 2 +-
 trunk/drivers/s390/crypto/ap_bus.c | 6 ++++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index a4d63953f3e0..8a26804e3550 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c960bec4fe5c58c288ea206061a40fbb0b28e768
+refs/heads/master: 8738e07d5c9b5b02f113c7e0ba67f0d8d6a5b23c
diff --git a/trunk/drivers/s390/crypto/ap_bus.c b/trunk/drivers/s390/crypto/ap_bus.c
index b987d4619586..fa5f05c643cb 100644
--- a/trunk/drivers/s390/crypto/ap_bus.c
+++ b/trunk/drivers/s390/crypto/ap_bus.c
@@ -338,6 +338,12 @@ static int ap_queue_enable_interruption(ap_qid_t qid, void *ind)
 			break;
 		case AP_RESPONSE_RESET_IN_PROGRESS:
 		case AP_RESPONSE_BUSY:
+			if (i < AP_MAX_RESET - 1) {
+				udelay(5);
+				status = ap_queue_interruption_control(qid,
+								       ind);
+				continue;
+			}
 			break;
 		case AP_RESPONSE_Q_NOT_AVAIL:
 		case AP_RESPONSE_DECONFIGURED: