From 552d7c0f48ba26925f503c9e651a3294db6f599c Mon Sep 17 00:00:00 2001
From: nakasima <nakasima@b08762b0-b915-fc4b-9d8c-17b2551a87ff>
Date: Thu, 6 Mar 2008 09:41:43 +0000
Subject: [PATCH] =?UTF-8?q?=E3=83=90=E3=83=83=E3=83=89=E3=83=96=E3=83=AD?=
 =?UTF-8?q?=E3=83=83=E3=82=AF=E7=BD=AE=E6=8F=9B=E5=87=A6=E7=90=86=E3=82=92?=
 =?UTF-8?q?=E8=BF=BD=E5=8A=A0=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

git-svn-id: file:///Users/lillianskinner/Downloads/platinum/twl/TwlIPL/trunk@838 b08762b0-b915-fc4b-9d8c-17b2551a87ff
---
 build/libraries_sysmenu/hotsw/ARM7/src/hotsw.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/build/libraries_sysmenu/hotsw/ARM7/src/hotsw.c b/build/libraries_sysmenu/hotsw/ARM7/src/hotsw.c
index e449efa4..3e7ad404 100644
--- a/build/libraries_sysmenu/hotsw/ARM7/src/hotsw.c
+++ b/build/libraries_sysmenu/hotsw/ARM7/src/hotsw.c
@@ -461,14 +461,16 @@ static HotSwState LoadCardData(void)
         }
     }
     else{
-        retval = (retval == HOTSW_SUCCESS) ? HOTSW_PULLED_OUT_ERROR : retval;
+        state = HOTSW_PULLED_OUT_ERROR;
+        retval = (retval == HOTSW_SUCCESS) ? state : retval;
     }
 
 end:
 	if( retval == HOTSW_SUCCESS )
 	{
         // バッドブロックを置換
-		HOTSWi_RefreshBadBlock(romMode);
+		state = HOTSWi_RefreshBadBlock(romMode);
+        retval = (retval == HOTSW_SUCCESS) ? state : retval;
 	}
 
 	// カードのロック開放(※ロックIDは開放せずに持ち続ける)