diff options
Diffstat (limited to 'arch')
-rw-r--r-- | arch/arm/mach-at91/include/mach/at91_mci.h | 2 | ||||
-rw-r--r-- | arch/s390/crypto/sha_common.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-at91/include/mach/at91_mci.h b/arch/arm/mach-at91/include/mach/at91_mci.h index 550d503a1bca..57f8ee154943 100644 --- a/arch/arm/mach-at91/include/mach/at91_mci.h +++ b/arch/arm/mach-at91/include/mach/at91_mci.h | |||
@@ -77,7 +77,7 @@ | |||
77 | 77 | ||
78 | #define AT91_MCI_BLKR 0x18 /* Block Register */ | 78 | #define AT91_MCI_BLKR 0x18 /* Block Register */ |
79 | #define AT91_MCI_BLKR_BCNT(n) ((0xffff & (n)) << 0) /* Block count */ | 79 | #define AT91_MCI_BLKR_BCNT(n) ((0xffff & (n)) << 0) /* Block count */ |
80 | #define AT91_MCI_BLKR_BLKLEN(n) ((0xffff & (n)) << 16) /* Block lenght */ | 80 | #define AT91_MCI_BLKR_BLKLEN(n) ((0xffff & (n)) << 16) /* Block length */ |
81 | 81 | ||
82 | #define AT91_MCI_RSPR(n) (0x20 + ((n) * 4)) /* Response Registers 0-3 */ | 82 | #define AT91_MCI_RSPR(n) (0x20 + ((n) * 4)) /* Response Registers 0-3 */ |
83 | #define AT91_MCR_RDR 0x30 /* Receive Data Register */ | 83 | #define AT91_MCR_RDR 0x30 /* Receive Data Register */ |
diff --git a/arch/s390/crypto/sha_common.c b/arch/s390/crypto/sha_common.c index 7903ec47e6b9..f42dbabc0d30 100644 --- a/arch/s390/crypto/sha_common.c +++ b/arch/s390/crypto/sha_common.c | |||
@@ -79,7 +79,7 @@ int s390_sha_final(struct shash_desc *desc, u8 *out) | |||
79 | memset(ctx->buf + index, 0x00, end - index - 8); | 79 | memset(ctx->buf + index, 0x00, end - index - 8); |
80 | 80 | ||
81 | /* | 81 | /* |
82 | * Append message length. Well, SHA-512 wants a 128 bit lenght value, | 82 | * Append message length. Well, SHA-512 wants a 128 bit length value, |
83 | * nevertheless we use u64, should be enough for now... | 83 | * nevertheless we use u64, should be enough for now... |
84 | */ | 84 | */ |
85 | bits = ctx->count * 8; | 85 | bits = ctx->count * 8; |