Merge master.kernel.org:/pub/scm/linux/kernel/git/davej/agpgart

[karo-tx-linux.git] / drivers / s390 / crypto / z90main.c

diff --git a/drivers/s390/crypto/z90main.c b/drivers/s390/crypto/z90main.c
index 0cb47eca91f3d9d459132ee34574da528c7f0831..04c2ef778ec69bc209bf830ab783a5234a56c108 100644 (file)
--- a/drivers/s390/crypto/z90main.c
+++ b/drivers/s390/crypto/z90main.c
@@ -3051,8 +3051,7 @@ destroy_crypto_device(int index)
        if (dev_ptr) {
                disabledFlag = dev_ptr->disabled;
                t = dev_ptr->dev_type;
-               if (dev_ptr->dev_resp_p)
-                       kfree(dev_ptr->dev_resp_p);
+               kfree(dev_ptr->dev_resp_p);
                kfree(dev_ptr);
        } else {
                disabledFlag = 0;
@@ -3080,11 +3079,11 @@ static void
 destroy_z90crypt(void)
 {
        int i;
+
        for (i = 0; i < z90crypt.max_count; i++)
                if (z90crypt.device_p[i])
                        destroy_crypto_device(i);
-       if (z90crypt.hdware_info)
-               kfree((void *)z90crypt.hdware_info);
+       kfree(z90crypt.hdware_info);
        memset((void *)&z90crypt, 0, sizeof(z90crypt));
 }