diff options
| author | Ulf Hansson <ulf.hansson@linaro.org> | 2019-02-28 09:16:18 +0100 |
|---|---|---|
| committer | Ulf Hansson <ulf.hansson@linaro.org> | 2019-02-28 09:16:18 +0100 |
| commit | 82b6248705cccc4341b4c1d4a80a70f018198db0 (patch) | |
| tree | 1341700e8cad07b71f90ad41826e6332adabe763 /drivers/mmc/core/block.c | |
| parent | ad9be7fff3e729287f61a2a5e811c03090003fff (diff) | |
| parent | c53336c8f5f29043fded57912cc06c24e12613d7 (diff) | |
| download | linux-82b6248705cccc4341b4c1d4a80a70f018198db0.tar.gz linux-82b6248705cccc4341b4c1d4a80a70f018198db0.tar.bz2 linux-82b6248705cccc4341b4c1d4a80a70f018198db0.zip | |
Merge branch 'fixes' into next
Diffstat (limited to 'drivers/mmc/core/block.c')
| -rw-r--r-- | drivers/mmc/core/block.c | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/drivers/mmc/core/block.c b/drivers/mmc/core/block.c index 54a7b7410441..2c71a434c915 100644 --- a/drivers/mmc/core/block.c +++ b/drivers/mmc/core/block.c @@ -2374,12 +2374,6 @@ static struct mmc_blk_data *mmc_blk_alloc_req(struct mmc_card *card, snprintf(md->disk->disk_name, sizeof(md->disk->disk_name), "mmcblk%u%s", card->host->index, subname ? subname : ""); - if (mmc_card_mmc(card)) - blk_queue_logical_block_size(md->queue.queue, - card->ext_csd.data_sector_size); - else - blk_queue_logical_block_size(md->queue.queue, 512); - set_capacity(md->disk, size); if (mmc_host_cmd23(card->host)) { |