diff options
| author | Tom Rini <trini@ti.com> | 2014-06-12 09:02:23 -0400 |
|---|---|---|
| committer | Tom Rini <trini@ti.com> | 2014-06-12 09:02:23 -0400 |
| commit | d8a97f934c64a7ba6f11da5e4cc7f3be57fcb82d (patch) | |
| tree | 2892161319e812828594a2c9b6f93a1c752b212a /disk/part.c | |
| parent | 6736ec15c518d013263fa97fc48ca22a50753792 (diff) | |
| parent | 3d6a5a4dfca25a202e356e4d63e89cdc6bd7255a (diff) | |
Merge branch 'master' of git://git.denx.de/u-boot-mmc
Diffstat (limited to 'disk/part.c')
| -rw-r--r-- | disk/part.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/disk/part.c b/disk/part.c index 2827089d8d5..b3097e32f0e 100644 --- a/disk/part.c +++ b/disk/part.c @@ -86,7 +86,7 @@ block_dev_desc_t *get_dev_hwpart(const char *ifname, int dev, int hwpart) block_dev_desc_t *dev_desc = reloc_get_dev(dev); if (!dev_desc) return NULL; - if (hwpart == -1) + if (hwpart == 0 && !select_hwpart) return dev_desc; if (!select_hwpart) return NULL; @@ -102,7 +102,7 @@ block_dev_desc_t *get_dev_hwpart(const char *ifname, int dev, int hwpart) block_dev_desc_t *get_dev(const char *ifname, int dev) { - return get_dev_hwpart(ifname, dev, -1); + return get_dev_hwpart(ifname, dev, 0); } #else block_dev_desc_t *get_dev_hwpart(const char *ifname, int dev, int hwpart) @@ -460,7 +460,7 @@ int get_device(const char *ifname, const char *dev_hwpart_str, hwpart_str++; } else { dev_str = dev_hwpart_str; - hwpart = -1; + hwpart = 0; } dev = simple_strtoul(dev_str, &ep, 16); |