sf: Fix the total flash size calculation.

No need to double the size in flash size calculation
as it was already done as a part of sector size
calculation.

Problem was introduced by:
Merge tag 'v2014.01' into xilinx/master-next
(sha1: 60513f2031793692e60e3b2fc1930243bb6bb991)

Signed-off-by: Siva Durga Prasad Paladugu <sivadur@xilinx.com>
Signed-off-by: Michal Simek <michal.simek@xilinx.com>

diff --git a/drivers/mtd/spi/sf_probe.c b/drivers/mtd/spi/sf_probe.c
index 36ae5e0a7736f4b46c3570b42bd2c8aa26bb6822..970a415127c22309982d0da97f848a6fe8bbad83 100644 (file)
--- a/drivers/mtd/spi/sf_probe.c
+++ b/drivers/mtd/spi/sf_probe.c
@@ -162,7 +162,7 @@ static struct spi_flash *spi_flash_validate_params(struct spi_slave *spi,
        }
        flash->page_size <<= flash->shift;
        flash->sector_size = params->sector_size << flash->shift;
-       flash->size = flash->sector_size * params->nr_sectors << flash->shift;
+       flash->size = flash->sector_size * params->nr_sectors;
 #ifdef CONFIG_SF_DUAL_FLASH
        if (flash->dual_flash & SF_DUAL_STACKED_FLASH)
                flash->size <<= 1;