diff options
| author | Stefan Roese <sr@denx.de> | 2007-08-15 21:06:27 +0200 | 
|---|---|---|
| committer | Stefan Roese <sr@denx.de> | 2007-08-15 21:06:27 +0200 | 
| commit | b706d63559aeec352bc72dd86d7d5423c15f6a60 (patch) | |
| tree | fdeda4d61970fef239d9d66ecd851fa46cfe5ec0 /common/flash.c | |
| parent | c8603cfbd4573379a6076c9c208545ba2bbf019a (diff) | |
| parent | 594e79838ce5078a90d0c27abb2b2d61d5f8e8a7 (diff) | |
| download | olio-uboot-2014.01-b706d63559aeec352bc72dd86d7d5423c15f6a60.tar.xz olio-uboot-2014.01-b706d63559aeec352bc72dd86d7d5423c15f6a60.zip | |
Merge with git://www.denx.de/git/u-boot.git
Diffstat (limited to 'common/flash.c')
| -rw-r--r-- | common/flash.c | 10 | 
1 files changed, 5 insertions, 5 deletions
| diff --git a/common/flash.c b/common/flash.c index a64bc9852..888ff9c67 100644 --- a/common/flash.c +++ b/common/flash.c @@ -47,16 +47,16 @@ flash_protect (int flag, ulong from, ulong to, flash_info_t *info)  	short s_end = info->sector_count - 1;	/* index of last sector */  	int i; -	debug ("flash_protect %s: from 0x%08lX to 0x%08lX\n", -		(flag & FLAG_PROTECT_SET) ? "ON" : -			(flag & FLAG_PROTECT_CLEAR) ? "OFF" : "???", -		from, to); -  	/* Do nothing if input data is bad. */  	if (info->sector_count == 0 || info->size == 0 || to < from) {  		return;  	} +	debug ("flash_protect %s: from 0x%08lX to 0x%08lX\n", +		(flag & FLAG_PROTECT_SET) ? "ON" : +			(flag & FLAG_PROTECT_CLEAR) ? "OFF" : "???", +		from, to); +  	/* There is nothing to do if we have no data about the flash  	 * or the protect range and flash range don't overlap.  	 */ |