Merge branch 'pm-cpufreq'

[firefly-linux-kernel-4.4.55.git] / drivers / scsi / scsi_debug.c

diff --git a/drivers/scsi/scsi_debug.c b/drivers/scsi/scsi_debug.c
index cb4fefa1bfbaea58a03e973de770233f41f6b34c..01c0ffa31276296a985d1381d53e1fc7ac069e80 100644 (file)
--- a/drivers/scsi/scsi_debug.c
+++ b/drivers/scsi/scsi_debug.c
@@ -1997,8 +1997,14 @@ static unsigned long lba_to_map_index(sector_t lba)
 
 static sector_t map_index_to_lba(unsigned long index)
 {
-       return index * scsi_debug_unmap_granularity -
-               scsi_debug_unmap_alignment;
+       sector_t lba = index * scsi_debug_unmap_granularity;
+
+       if (scsi_debug_unmap_alignment) {
+               lba -= scsi_debug_unmap_granularity -
+                       scsi_debug_unmap_alignment;
+       }
+
+       return lba;
 }
 
 static unsigned int map_state(sector_t lba, unsigned int *num)
@@ -2659,8 +2665,8 @@ static void __init sdebug_build_parts(unsigned char *ramp,
                               / sdebug_sectors_per;
                pp->end_sector = (end_sec % sdebug_sectors_per) + 1;
 
-               pp->start_sect = start_sec;
-               pp->nr_sects = end_sec - start_sec + 1;
+               pp->start_sect = cpu_to_le32(start_sec);
+               pp->nr_sects = cpu_to_le32(end_sec - start_sec + 1);
                pp->sys_ind = 0x83;     /* plain Linux partition */
        }
 }