disk/part.c: fix relocation fixup

Portions of this work were supported by funding from
the CE Linux Forum.

Signed-off-by: Heiko Schocher <hs@denx.de>

diff --git a/disk/part.c b/disk/part.c
index 1806fe6e18f0a1a91d837e4c8d16bdbb6ce1355b..2b63db6c75f00f1b951f9bbf28dcbaab72929f82 100644 (file)
--- a/disk/part.c
+++ b/disk/part.c
@@ -78,13 +78,20 @@ block_dev_desc_t *get_dev(char* ifname, int dev)
 {
        const struct block_drvr *drvr = block_drvr;
        block_dev_desc_t* (*reloc_get_dev)(int dev);
+       char *name;
 
-       while (drvr->name) {
+       name = drvr->name;
+#ifndef CONFIG_RELOC_FIXUP_WORKS
+       name += gd->reloc_off;
+#endif
+       while (name) {
+               name = drvr->name;
                reloc_get_dev = drvr->get_dev;
 #ifndef CONFIG_RELOC_FIXUP_WORKS
+               name += gd->reloc_off;
                reloc_get_dev += gd->reloc_off;
 #endif
-               if (strncmp(ifname, drvr->name, strlen(drvr->name)) == 0)
+               if (strncmp(ifname, name, strlen(name)) == 0)
                        return reloc_get_dev(dev);
                drvr++;
        }