From 153dd989df15623c40f7881d15dae039487cf351 Mon Sep 17 00:00:00 2001 From: David Brownell Date: Tue, 12 May 2009 16:23:32 -0700 Subject: [PATCH] --- yaml --- r: 153788 b: refs/heads/master c: f19e8999a5631e3af0e1ca5127af80a25aba1fd7 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/mtd/nand/davinci_nand.c | 11 ----------- 2 files changed, 1 insertion(+), 12 deletions(-) diff --git a/[refs] b/[refs] index 704de460f189..1df0c679fe0b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ee8f37688966ab1438d0cf42e0cb7c6595d9592c +refs/heads/master: f19e8999a5631e3af0e1ca5127af80a25aba1fd7 diff --git a/trunk/drivers/mtd/nand/davinci_nand.c b/trunk/drivers/mtd/nand/davinci_nand.c index cb5a05e01531..ba6940d1d3d1 100644 --- a/trunk/drivers/mtd/nand/davinci_nand.c +++ b/trunk/drivers/mtd/nand/davinci_nand.c @@ -717,19 +717,8 @@ static int __init nand_davinci_probe(struct platform_device *pdev) static const char *probes[] __initconst = { "cmdlinepart", NULL }; - const char *master_name; - - /* Set info->mtd.name = 0 temporarily */ - master_name = info->mtd.name; - info->mtd.name = (char *)0; - - /* info->mtd.name == 0, means: don't bother checking - */ mtd_parts_nb = parse_mtd_partitions(&info->mtd, probes, &mtd_parts, 0); - - /* Restore info->mtd.name */ - info->mtd.name = master_name; } if (mtd_parts_nb <= 0) {