Disable PCMCIA for adm5120, request IRQ for the USB driver, fix duplicate lines in...

[openwrt.git] / target / linux / adm5120-2.6 / files / drivers / mtd / myloader.c

diff --git a/target/linux/adm5120-2.6/files/drivers/mtd/myloader.c b/target/linux/adm5120-2.6/files/drivers/mtd/myloader.c
index 023ae5c..ee916d7 100644 (file)
--- a/target/linux/adm5120-2.6/files/drivers/mtd/myloader.c
+++ b/target/linux/adm5120-2.6/files/drivers/mtd/myloader.c
@@ -115,14 +115,14 @@ int parse_myloader_partitions(struct mtd_info *master,
        mtd_part = mtd_parts;
        names = (char *)&mtd_parts[num_parts];
 
        mtd_part = mtd_parts;
        names = (char *)&mtd_parts[num_parts];
 

-       strcpy(NAME_MYLOADER, names);
+       strncpy(names, NAME_MYLOADER, NAME_LEN_MAX-1);

        mtd_part->name = names;
        mtd_part->offset = 0;
        mtd_part->size = blocklen;
        mtd_part++;
        names += NAME_LEN_MAX;
 
        mtd_part->name = names;
        mtd_part->offset = 0;
        mtd_part->size = blocklen;
        mtd_part++;
        names += NAME_LEN_MAX;
 

-       strcpy(NAME_PARTITION_TABLE, names);
+       strncpy(names, NAME_PARTITION_TABLE, NAME_LEN_MAX-1);

        mtd_part->name = names;
        mtd_part->offset = blocklen;
        mtd_part->size = blocklen;
        mtd_part->name = names;
        mtd_part->offset = blocklen;
        mtd_part->size = blocklen;