From 32b19d35517858b80fee121e92f38820f106b5f9 Mon Sep 17 00:00:00 2001 From: Minkyu Kang Date: Wed, 15 Dec 2010 14:23:50 +0900 Subject: [PATCH] Revert "mmc: fixed wrong mmc device index" This reverts commit a5768f4b9c5aefe5d0a4b00e346e749c5cf6922e. --- drivers/mmc/mmc.c | 5 +---- drivers/mmc/s5p_mmc.c | 2 +- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/drivers/mmc/mmc.c b/drivers/mmc/mmc.c index 1e4aede..d63514c 100644 --- a/drivers/mmc/mmc.c +++ b/drivers/mmc/mmc.c @@ -932,10 +932,7 @@ int mmc_register(struct mmc *mmc) { /* Setup the universal parts of the block interface just once */ mmc->block_dev.if_type = IF_TYPE_MMC; - - /* Device index didn't ensure to increase sequential */ - if (!mmc->block_dev.dev) - mmc->block_dev.dev = cur_dev_num++; + mmc->block_dev.dev = cur_dev_num++; mmc->block_dev.removable = 1; mmc->block_dev.block_read = mmc_bread; mmc->block_dev.block_write = mmc_bwrite; diff --git a/drivers/mmc/s5p_mmc.c b/drivers/mmc/s5p_mmc.c index f51ca17..5767f37 100644 --- a/drivers/mmc/s5p_mmc.c +++ b/drivers/mmc/s5p_mmc.c @@ -566,7 +566,7 @@ static int s5p_mmc_initialize(int dev_index, int bus_width) #ifdef CONFIG_MMC_ASYNC_WRITE mmc_host[dev_index].async_write = 0; #endif - mmc->block_dev.dev = dev_index; + mmc_register(mmc); return 0; -- 2.7.4