X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=drivers%2Fmtd%2Fchips%2Fgen_probe.c;h=cdb0f590b40c117ba246f23e2351528608476df2;hb=45c091bb2d453ce4a8b06cf19872ec7a77fc4799;hp=52d59d35091d405f3ee65edbaaaa304b87073a8f;hpb=f6a673b3f4f93c1c50e1b18f29254b0531b722a8;p=powerpc.git

diff --git a/drivers/mtd/chips/gen_probe.c b/drivers/mtd/chips/gen_probe.c
index 52d59d3509..cdb0f590b4 100644
--- a/drivers/mtd/chips/gen_probe.c
+++ b/drivers/mtd/chips/gen_probe.c
@@ -207,15 +207,15 @@ static inline struct mtd_info *cfi_cmdset_unknown(struct map_info *map,
 	struct cfi_private *cfi = map->fldrv_priv;
 	__u16 type = primary?cfi->cfiq->P_ID:cfi->cfiq->A_ID;
 #ifdef CONFIG_MODULES
-	char probename[32];
+	char probename[16+sizeof(MODULE_SYMBOL_PREFIX)];
 	cfi_cmdset_fn_t *probe_function;
 
-	sprintf(probename, "cfi_cmdset_%4.4X", type);
+	sprintf(probename, MODULE_SYMBOL_PREFIX "cfi_cmdset_%4.4X", type);
 
-	probe_function = (void *)symbol_get(probename);
+	probe_function = __symbol_get(probename);
 	if (!probe_function) {
-		request_module(probename);
-		probe_function = (void *)symbol_get(probename);
+		request_module(probename + sizeof(MODULE_SYMBOL_PREFIX) - 1);
+		probe_function = __symbol_get(probename);
 	}
 
 	if (probe_function) {