Merge branch 'for-linus' of git://git390.marist.edu/pub/scm/linux-2.6

[linux-2.6-omap-h63xx.git] / drivers / s390 / crypto / zcrypt_pcixcc.c

diff --git a/drivers/s390/crypto/zcrypt_pcixcc.c b/drivers/s390/crypto/zcrypt_pcixcc.c
index e7a1e22e77acf82425b8a60c5d25426f83c6aca4..c20d4790258e247c9638f61a928bf4f578c163c8 100644 (file)
--- a/drivers/s390/crypto/zcrypt_pcixcc.c
+++ b/drivers/s390/crypto/zcrypt_pcixcc.c
@@ -781,8 +781,7 @@ static long zcrypt_pcixcc_send_cprb(struct zcrypt_device *zdev,
                /* Signal pending. */
                ap_cancel_message(zdev->ap_dev, &ap_msg);
 out_free:
-       memset(ap_msg.message, 0x0, ap_msg.length);
-       kfree(ap_msg.message);
+       kzfree(ap_msg.message);
        return rc;
 }