Merge tag 'v3.19-rc7' into perf/core, to merge fixes before applying new changes

[karo-tx-linux.git] / drivers / scsi / scsicam.c

diff --git a/drivers/scsi/scsicam.c b/drivers/scsi/scsicam.c
index 92d24d6dcb395399da066c6604e830b0c775a482..910f4a7a39248a56ea7a123030551c90410fa30d 100644 (file)
--- a/drivers/scsi/scsicam.c
+++ b/drivers/scsi/scsicam.c
@@ -163,8 +163,8 @@ int scsi_partsize(unsigned char *buf, unsigned long capacity,
                    end_head * end_sector + end_sector;
 
                /* This is the actual _sector_ number at the end */
-               logical_end = get_unaligned(&largest->start_sect)
-                   + get_unaligned(&largest->nr_sects);
+               logical_end = get_unaligned_le32(&largest->start_sect)
+                   + get_unaligned_le32(&largest->nr_sects);
 
                /* This is for >1023 cylinders */
                ext_cyl = (logical_end - (end_head * end_sector + end_sector))