Merge master.kernel.org:/home/rmk/linux-2.6-arm

[deliverable/linux.git] / drivers / s390 / crypto / zcrypt_pcicc.c

diff --git a/drivers/s390/crypto/zcrypt_pcicc.c b/drivers/s390/crypto/zcrypt_pcicc.c
index f4b0c47954341d4fcc5d88af1119d4064580db92..142f72a2ca5a75ec7ea1bf4d2d3fa2a2219dad1f 100644 (file)
--- a/drivers/s390/crypto/zcrypt_pcicc.c
+++ b/drivers/s390/crypto/zcrypt_pcicc.c
@@ -373,6 +373,8 @@ static int convert_type86(struct zcrypt_device *zdev,
                        zdev->max_mod_size = PCICC_MAX_MOD_SIZE_OLD;
                        return -EAGAIN;
                }
+               if (service_rc == 8 && service_rs == 72)
+                       return -EINVAL;
                zdev->online = 0;
                return -EAGAIN; /* repeat the request on a different device. */
        }
@@ -483,6 +485,7 @@ static long zcrypt_pcicc_modexpo(struct zcrypt_device *zdev,
        struct completion work;
        int rc;
 
+       ap_init_message(&ap_msg);
        ap_msg.message = (void *) get_zeroed_page(GFP_KERNEL);
        if (!ap_msg.message)
                return -ENOMEM;
@@ -521,6 +524,7 @@ static long zcrypt_pcicc_modexpo_crt(struct zcrypt_device *zdev,
        struct completion work;
        int rc;
 
+       ap_init_message(&ap_msg);
        ap_msg.message = (void *) get_zeroed_page(GFP_KERNEL);
        if (!ap_msg.message)
                return -ENOMEM;