diff --git a/drivers/crypto/atmel-i2c.c b/drivers/crypto/atmel-i2c.c
index be49ab7f4338..dc876fab2882 100644
--- a/drivers/crypto/atmel-i2c.c
+++ b/drivers/crypto/atmel-i2c.c
@@ -34,7 +34,7 @@ static void atmel_i2c_checksum(struct atmel_i2c_cmd *cmd)
 {
 	u8 *data = &cmd->count;
 	size_t len = cmd->count - CRC_SIZE;
-	u16 *__crc16 = (u16 *)(data + len);
+	__le16 *__crc16 = (__le16 *)(data + len);
 
 	*__crc16 = cpu_to_le16(bitrev16(crc16(0, data, len)));
 }
@@ -48,7 +48,7 @@ void atmel_i2c_init_read_cmd(struct atmel_i2c_cmd *cmd)
 	 * (UserExtra, Selector, LockValue, LockConfig).
 	 */
 	cmd->param1 = CONFIG_ZONE;
-	cmd->param2 = DEVICE_LOCK_ADDR;
+	cmd->param2 = cpu_to_le16(DEVICE_LOCK_ADDR);
 	cmd->count = READ_COUNT;
 
 	atmel_i2c_checksum(cmd);
diff --git a/drivers/crypto/atmel-i2c.h b/drivers/crypto/atmel-i2c.h
index c6bd43b78f33..21860b99c3e3 100644
--- a/drivers/crypto/atmel-i2c.h
+++ b/drivers/crypto/atmel-i2c.h
@@ -8,6 +8,7 @@
 #define __ATMEL_I2C_H__
 
 #include <linux/hw_random.h>
+#include <linux/types.h>
 
 #define ATMEL_ECC_PRIORITY		300
 
@@ -50,7 +51,7 @@ struct atmel_i2c_cmd {
 	u8 count;
 	u8 opcode;
 	u8 param1;
-	u16 param2;
+	__le16 param2;
 	u8 data[MAX_RSP_SIZE];
 	u8 msecs;
 	u16 rxsize;