1 files changed, 3 insertions, 2 deletions

diff --git a/drivers/scsi/libiscsi.c b/drivers/scsi/libiscsi.c
index 04707d667c9d..3f5b9b445b29 100644
--- a/drivers/scsi/libiscsi.c
+++ b/drivers/scsi/libiscsi.c
@@ -25,6 +25,7 @@
 #include <linux/mutex.h>
 #include <linux/kfifo.h>
 #include <linux/delay.h>
+#include <asm/unaligned.h>
 #include <net/tcp.h>
 #include <scsi/scsi_cmnd.h>
 #include <scsi/scsi_device.h>
@@ -269,14 +270,14 @@ invalid_datalen:
                         goto out;
                 }
 
-                senselen = be16_to_cpu(*(__be16 *)data);
+                senselen = be16_to_cpu(get_unaligned((__be16 *) data));
                 if (datalen < senselen)
                         goto invalid_datalen;
 
                 memcpy(sc->sense_buffer, data + 2,
                        min_t(uint16_t, senselen, SCSI_SENSE_BUFFERSIZE));
                 debug_scsi("copied %d bytes of sense\n",
-                           min(senselen, SCSI_SENSE_BUFFERSIZE));
+                           min_t(uint16_t, senselen, SCSI_SENSE_BUFFERSIZE));
         }
 
         if (sc->sc_data_direction == DMA_TO_DEVICE)