From 7f862968349f022fb33c95261dc307d6b693c7d9 Mon Sep 17 00:00:00 2001 From: juhosg <juhosg@3c298f89-4303-0410-b956-a3cf2f4a3e73> Date: Fri, 23 Jan 2009 11:54:44 +0000 Subject: [PATCH] [kernel] generic-2.6: make MyLoader parser compatible with the old partition tables git-svn-id: svn://svn.openwrt.org/openwrt/trunk@14155 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- target/linux/generic-2.6/files/drivers/mtd/myloader.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/target/linux/generic-2.6/files/drivers/mtd/myloader.c b/target/linux/generic-2.6/files/drivers/mtd/myloader.c index 60ebe2205..51c037459 100644 --- a/target/linux/generic-2.6/files/drivers/mtd/myloader.c +++ b/target/linux/generic-2.6/files/drivers/mtd/myloader.c @@ -2,7 +2,7 @@ * Parse MyLoader-style flash partition tables and produce a Linux partition * array to match. * - * Copyright (C) 2007-2008 Gabor Juhos <juhosg@openwrt.org> + * Copyright (C) 2007-2009 Gabor Juhos <juhosg@openwrt.org> * * This file was based on drivers/mtd/redboot.c * Author: Red Hat, Inc. - David Woodhouse <dwmw2@cambridge.redhat.com> @@ -133,7 +133,7 @@ int myloader_parse_partitions(struct mtd_info *master, if (le16_to_cpu(part->type) == PARTITION_TYPE_FREE) continue; - if (buf->names[i][0]) + if ((buf->names[i][0]) && (buf->names[i][0] != '\xff')) strncpy(names, buf->names[i], PART_NAME_LEN); else snprintf(names, PART_NAME_LEN, "partition%d", i); -- 2.20.1