Merge remote-tracking branch 'staging/staging-next'

[deliverable/linux.git] / drivers / staging / lustre / lnet / libcfs / linux / linux-crypto.c

diff --git a/drivers/staging/lustre/lnet/libcfs/linux/linux-crypto.c b/drivers/staging/lustre/lnet/libcfs/linux/linux-crypto.c
index 5c0116ade90949caa46e2c077cfec870e39b7b3e..7f56d2c9dd001bda96d2beda6d2c10e0b7649786 100644 (file)
--- a/drivers/staging/lustre/lnet/libcfs/linux/linux-crypto.c
+++ b/drivers/staging/lustre/lnet/libcfs/linux/linux-crypto.c
@@ -95,8 +95,8 @@ static int cfs_crypto_hash_alloc(enum cfs_crypto_hash_alg hash_alg,
                err = crypto_ahash_setkey(tfm, key, key_len);
        else if ((*type)->cht_key != 0)
                err = crypto_ahash_setkey(tfm,
-                                        (unsigned char *)&((*type)->cht_key),
-                                        (*type)->cht_size);
+                                         (unsigned char *)&((*type)->cht_key),
+                                         (*type)->cht_size);
 
        if (err != 0) {
                ahash_request_free(*req);