diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2015-12-22 15:43:18 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-12-22 15:43:18 -0800 |
| commit | ad3d1abb305459592f9dcf47d3c7d30f5e8dd5b7 (patch) | |
| tree | eccc63c0a71bf7372e548cc7295de61179c022c0 /drivers | |
| parent | ea828131909d77ae3185991669ecc0152519ea1d (diff) | |
| parent | 272fa59ccb4fc802af28b1d699c2463db6a71bf7 (diff) | |
| download | linux-ad3d1abb305459592f9dcf47d3c7d30f5e8dd5b7.tar.gz linux-ad3d1abb305459592f9dcf47d3c7d30f5e8dd5b7.tar.bz2 linux-ad3d1abb305459592f9dcf47d3c7d30f5e8dd5b7.zip | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux
Pull s390 fixes from Martin Schwidefsky:
"Two late bug fixes for kernel 4.4.
Merry Christmas"
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux:
s390/dis: Fix handling of format specifiers
s390/zcrypt: Fix AP queue handling if queue is full
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/s390/crypto/ap_bus.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/s390/crypto/ap_bus.c b/drivers/s390/crypto/ap_bus.c index 61f768518a34..24ec282e15d8 100644 --- a/drivers/s390/crypto/ap_bus.c +++ b/drivers/s390/crypto/ap_bus.c @@ -599,8 +599,10 @@ static enum ap_wait ap_sm_read(struct ap_device *ap_dev) status = ap_sm_recv(ap_dev); switch (status.response_code) { case AP_RESPONSE_NORMAL: - if (ap_dev->queue_count > 0) + if (ap_dev->queue_count > 0) { + ap_dev->state = AP_STATE_WORKING; return AP_WAIT_AGAIN; + } ap_dev->state = AP_STATE_IDLE; return AP_WAIT_NONE; case AP_RESPONSE_NO_PENDING_REPLY: |