From 4d3c7a8441def68f67cf341a7c64787e4e8ebd84 Mon Sep 17 00:00:00 2001 From: rmilecki Date: Wed, 22 Apr 2015 19:06:58 +0000 Subject: [PATCH] nvram: drop support for ancient /dev/mtdblock/%d MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Path /dev/mtdblock%d is used for years now. Signed-off-by: Rafał Miłecki git-svn-id: svn://svn.openwrt.org/openwrt/trunk@45562 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- package/utils/nvram/src/nvram.c | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-) diff --git a/package/utils/nvram/src/nvram.c b/package/utils/nvram/src/nvram.c index a0bc006d15..b3ef4262a5 100644 --- a/package/utils/nvram/src/nvram.c +++ b/package/utils/nvram/src/nvram.c @@ -445,7 +445,7 @@ char * nvram_find_mtd(void) { nvram_erase_size = esz; - sprintf(dev, "/dev/mtdblock/%d", i); + sprintf(dev, "/dev/mtdblock%d", i); if( stat(dev, &s) > -1 && (s.st_mode & S_IFBLK) ) { if( (path = (char *) malloc(strlen(dev)+1)) != NULL ) @@ -454,18 +454,6 @@ char * nvram_find_mtd(void) break; } } - else - { - sprintf(dev, "/dev/mtdblock%d", i); - if( stat(dev, &s) > -1 && (s.st_mode & S_IFBLK) ) - { - if( (path = (char *) malloc(strlen(dev)+1)) != NULL ) - { - strncpy(path, dev, strlen(dev)+1); - break; - } - } - } } } fclose(fp); -- 2.11.0