summaryrefslogtreecommitdiff
path: root/drivers/s390
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/s390')
-rw-r--r--drivers/s390/crypto/vfio_ap_ops.c11
1 files changed, 7 insertions, 4 deletions
diff --git a/drivers/s390/crypto/vfio_ap_ops.c b/drivers/s390/crypto/vfio_ap_ops.c
index 3fd80533194b..be92ba45226d 100644
--- a/drivers/s390/crypto/vfio_ap_ops.c
+++ b/drivers/s390/crypto/vfio_ap_ops.c
@@ -1654,9 +1654,13 @@ retry_zapq:
switch (status.response_code) {
case AP_RESPONSE_NORMAL:
ret = 0;
- /* if the reset has not completed, wait for it to take effect */
- if (!status.queue_empty || status.irq_enabled)
+ if (!status.irq_enabled)
+ vfio_ap_free_aqic_resources(q);
+ if (!status.queue_empty || status.irq_enabled) {
ret = apq_reset_check(q);
+ if (status.irq_enabled && ret == 0)
+ vfio_ap_free_aqic_resources(q);
+ }
break;
case AP_RESPONSE_RESET_IN_PROGRESS:
/*
@@ -1675,6 +1679,7 @@ retry_zapq:
* completed successfully.
*/
ret = 0;
+ vfio_ap_free_aqic_resources(q);
break;
default:
WARN(true,
@@ -1684,8 +1689,6 @@ retry_zapq:
return -EIO;
}
- vfio_ap_free_aqic_resources(q);
-
return ret;
}