diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-01-27 09:27:44 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-01-27 09:27:44 -0800 |
| commit | 981a2edd1922c00e747680f30734ea50c86af28d (patch) | |
| tree | e32a9896900ea525eeb6019e618f8fa9d233d81e /drivers/s390/crypto/zcrypt_pcixcc.c | |
| parent | 4bdadb9785696439c6e2b3efe34aa76df1149c83 (diff) | |
| parent | 21ec7f6dbf10492ce9a21718040677d3e68bd57d (diff) | |
Merge branch 'for-linus' of git://git390.marist.edu/pub/scm/linux-2.6
* 'for-linus' of git://git390.marist.edu/pub/scm/linux-2.6:
[S390] fix single stepped svcs with TRACE_IRQFLAGS=y
[S390] zcrypt: Do not remove coprocessor for error 8/72
[S390] sclp_vt220: set initial terminal window size
[S390] use set_current_state in sigsuspend
[S390] irqflags: add missing types.h include
[S390] dasd: fix possible NULL pointer errors
Diffstat (limited to 'drivers/s390/crypto/zcrypt_pcixcc.c')
| -rw-r--r-- | drivers/s390/crypto/zcrypt_pcixcc.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/s390/crypto/zcrypt_pcixcc.c b/drivers/s390/crypto/zcrypt_pcixcc.c index 79c120578e61..68f3e6204db8 100644 --- a/drivers/s390/crypto/zcrypt_pcixcc.c +++ b/drivers/s390/crypto/zcrypt_pcixcc.c @@ -470,6 +470,8 @@ static int convert_type86_ica(struct zcrypt_device *zdev, } if (service_rc == 12 && service_rs == 769) return -EINVAL; + if (service_rc == 8 && service_rs == 72) + return -EINVAL; zdev->online = 0; return -EAGAIN; /* repeat the request on a different device. */ } |