diff options
| author | Tom Rini <trini@ti.com> | 2014-05-06 14:45:51 -0400 |
|---|---|---|
| committer | Tom Rini <trini@ti.com> | 2014-05-06 14:45:51 -0400 |
| commit | 3c3f13f81942134edff280fcb5e7137c623e7dac (patch) | |
| tree | b4c23dce6db18c7942f309c32cd80b8db31ba95d /board/samsung/common/ums.c | |
| parent | 52fded7b94d98c73a824e4a9d90596a33a1cbb8a (diff) | |
| parent | af41d6b4cb1602abebaaa9c8774a9b0ece564796 (diff) | |
| download | u-boot-imx-3c3f13f81942134edff280fcb5e7137c623e7dac.zip u-boot-imx-3c3f13f81942134edff280fcb5e7137c623e7dac.tar.gz u-boot-imx-3c3f13f81942134edff280fcb5e7137c623e7dac.tar.bz2 | |
Merge branch 'master' of git://git.denx.de/u-boot-usb
Diffstat (limited to 'board/samsung/common/ums.c')
| -rw-r--r-- | board/samsung/common/ums.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/board/samsung/common/ums.c b/board/samsung/common/ums.c index dc155ad..cebabe9 100644 --- a/board/samsung/common/ums.c +++ b/board/samsung/common/ums.c @@ -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); } |