From: Rafał Miłecki <zajec5@gmail.com>
Date: Wed, 22 Apr 2015 19:06:58 +0000 (+0000)
Subject: nvram: drop support for ancient /dev/mtdblock/%d
X-Git-Tag: reboot~3180
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=615fef1ab8051d06482aa59a2709825f0e2e3047;p=oweals%2Fopenwrt.git

nvram: drop support for ancient /dev/mtdblock/%d

Path /dev/mtdblock%d is used for years now.

Signed-off-by: Rafał Miłecki <zajec5@gmail.com>

SVN-Revision: 45562
---

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);