X-Git-Url: http://git.openwrt.org/?a=blobdiff_plain;f=target%2Flinux%2Fbrcm47xx%2Fbase-files%2Flib%2Fupgrade%2Fplatform.sh;fp=target%2Flinux%2Fbrcm47xx%2Fbase-files%2Flib%2Fupgrade%2Fplatform.sh;h=9e8db8a13757a5a3be82c96222788f93cffa6edd;hb=a445846305cc87ee4054341ba5c93132a02d901a;hp=d4017b4980ae4d71aff9214911df7672f9d69819;hpb=44dfe1757696b21222f64267ba5da2506ac233f4;p=openwrt%2Fopenwrt.git

diff --git a/target/linux/brcm47xx/base-files/lib/upgrade/platform.sh b/target/linux/brcm47xx/base-files/lib/upgrade/platform.sh
index d4017b4980..9e8db8a137 100644
--- a/target/linux/brcm47xx/base-files/lib/upgrade/platform.sh
+++ b/target/linux/brcm47xx/base-files/lib/upgrade/platform.sh
@@ -89,6 +89,7 @@ platform_check_image() {
 
 	local file_type=$(brcm47xx_identify "$1")
 	local magic
+	local error=0
 
 	case "$file_type" in
 		"chk")
@@ -100,16 +101,14 @@ platform_check_image() {
 
 			[ -n "$dev_board_id" -a "$board_id" != "$dev_board_id" ] && {
 				echo "Firmware board_id doesn't match device board_id ($dev_board_id)"
-				return 1
+				error=1
 			}
 
 			magic=$(get_magic_long_at "$1" "$header_len")
 			[ "$magic" != "48445230" ] && {
 				echo "No valid TRX firmware in the CHK image"
-				return 1
+				error=1
 			}
-
-			return 0
 		;;
 		"cybertan")
 			local pattern=$(dd if="$1" bs=1 count=4 2>/dev/null | hexdump -v -e '1/1 "%c"')
@@ -118,25 +117,24 @@ platform_check_image() {
 
 			[ -n "$dev_pattern" -a "$pattern" != "$dev_pattern" ] && {
 				echo "Firmware pattern doesn't match device pattern ($dev_pattern)"
-				return 1
+				error=1
 			}
 
 			magic=$(get_magic_long_at "$1" 32)
 			[ "$magic" != "48445230" ] && {
 				echo "No valid TRX firmware in the CyberTAN image"
-				return 1
+				error=1
 			}
-
-			return 0
 		;;
 		"trx")
-			return 0
 		;;
 		*)
 			echo "Invalid image type. Please use only .trx files"
-			return 1
+			error=1
 		;;
 	esac
+
+	return $error
 }
 
 platform_do_upgrade_chk() {