diff options
| -rw-r--r-- | common/cmd_nvedit.c | 3 | ||||
| -rw-r--r-- | common/iomux.c | 10 | 
2 files changed, 0 insertions, 13 deletions
| diff --git a/common/cmd_nvedit.c b/common/cmd_nvedit.c index 1f9c67426..68c38f4e5 100644 --- a/common/cmd_nvedit.c +++ b/common/cmd_nvedit.c @@ -238,9 +238,6 @@ int env_check_apply(const char *name, const char *oldval,  		/* Try assigning specified device */  		if (console_assign(console, newval) < 0)  			return 1; - -		if (serial_assign(newval) < 0) -			return 1;  #endif /* CONFIG_CONSOLE_MUX */  	} diff --git a/common/iomux.c b/common/iomux.c index dbc231250..6a757041f 100644 --- a/common/iomux.c +++ b/common/iomux.c @@ -135,16 +135,6 @@ int iomux_doenv(const int console, const char *arg)  		 */  		if (console_assign(console, start[j]) < 0)  			continue; -		/* -		 * This was taken from common/cmd_nvedit.c. -		 * This will never work because serial_assign() returns -		 * 1 upon error, not -1. -		 * This would almost always return an error anyway because -		 * serial_assign() expects the name of a serial device, like -		 * serial_smc, but the user generally only wants to set serial. -		 */ -		if (serial_assign(start[j]) < 0) -			continue;  		cons_set[cs_idx++] = dev;  	}  	free(console_args); |