From mboxrd@z Thu Jan 1 00:00:00 1970 From: Lukasz Majewski Date: Tue, 15 Apr 2014 16:24:28 +0200 Subject: [U-Boot] [PATCH v4 07/13] ums: always initialize mmc before ums_disk_init() In-Reply-To: <1397567221-2065-8-git-send-email-m.zalega@samsung.com> References: <1389277919-15279-1-git-send-email-m.zalega@samsung.com> <1397567221-2065-1-git-send-email-m.zalega@samsung.com> <1397567221-2065-8-git-send-email-m.zalega@samsung.com> Message-ID: <20140415162428.2b9bf5d3@amdc2363> List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: u-boot@lists.denx.de Hi Mateusz, > In some cases MMC was still uninitialized while media capacity check, > leading to broken ums command. > > Tested on Samsung Goni. > > Signed-off-by: Mateusz Zalega > Tested-by: Mateusz Zalega > Cc: Lukasz Majewski > Cc: Minkyu Kang > --- > board/samsung/common/ums.c | 10 ++++------ > 1 file changed, 4 insertions(+), 6 deletions(-) > > diff --git a/board/samsung/common/ums.c b/board/samsung/common/ums.c > index dc155ad..dec2963 100644 > --- a/board/samsung/common/ums.c > +++ b/board/samsung/common/ums.c > @@ -37,8 +37,8 @@ static struct ums ums_dev = { > > static struct ums *ums_disk_init(struct mmc *mmc) > { > - uint64_t mmc_end_sector = mmc->capacity / SECTOR_SIZE; > - uint64_t ums_end_sector = UMS_NUM_SECTORS + UMS_START_SECTOR; > + const uint64_t mmc_end_sector = mmc->capacity / SECTOR_SIZE; > + const uint64_t ums_end_sector = UMS_NUM_SECTORS + > UMS_START_SECTOR; > if (!mmc_end_sector) { > error("MMC capacity is not valid"); > @@ -66,11 +66,9 @@ static struct ums *ums_disk_init(struct mmc *mmc) > > struct ums *ums_init(unsigned int dev_num) > { > - struct mmc *mmc = NULL; > + struct mmc *mmc = find_mmc_device(dev_num); > > - mmc = find_mmc_device(dev_num); > - if (!mmc) > + if (!mmc || mmc_init(mmc)) > return NULL; > - > return ums_disk_init(mmc); > } Acked-by: Lukasz Majewski -- Best regards, Lukasz Majewski Samsung R&D Institute Poland (SRPOL) | Linux Platform Group