diff options
| author | Steven Kinney <steven.kinney@linaro.org> | 2013-11-22 08:15:09 -0600 |
|---|---|---|
| committer | Steven Kinney <steven.kinney@linaro.org> | 2013-11-22 08:15:09 -0600 |
| commit | aec0833cc55918a9111af736171ba8ceb976824e (patch) | |
| tree | 3b188d6e0c1075a5df74f724bb302486454e25e8 /MdeModulePkg/Universal/Network/IScsiDxe/IScsiProto.c | |
| parent | e08b4a7ea684e3358f0281da5e23ae03b1b14116 (diff) | |
| parent | 0caeca1501ec2edee346a3108f45e556e7905204 (diff) | |
Merging uefi-next/linaro-release into masterlinaro-uefi-2013.11
Signed-off-by: Steven Kinney <steven.kinney@linaro.org>
Diffstat (limited to 'MdeModulePkg/Universal/Network/IScsiDxe/IScsiProto.c')
| -rw-r--r-- | MdeModulePkg/Universal/Network/IScsiDxe/IScsiProto.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/MdeModulePkg/Universal/Network/IScsiDxe/IScsiProto.c b/MdeModulePkg/Universal/Network/IScsiDxe/IScsiProto.c index 5a6002e83..ffe0c6e1a 100644 --- a/MdeModulePkg/Universal/Network/IScsiDxe/IScsiProto.c +++ b/MdeModulePkg/Universal/Network/IScsiDxe/IScsiProto.c @@ -2535,7 +2535,8 @@ IScsiExecuteScsiCommand ( Timeout = 0;
if (Session->State != SESSION_STATE_LOGGED_IN) {
- return EFI_DEVICE_ERROR;
+ Status = EFI_DEVICE_ERROR;
+ goto ON_EXIT;
}
Conn = NET_LIST_USER_STRUCT_S (
@@ -2707,7 +2708,7 @@ IScsiSessionReinstatement ( EFI_STATUS Status;
Session = &Private->Session;
- ASSERT (Session->State == SESSION_STATE_LOGGED_IN);
+ ASSERT (Session->State != SESSION_STATE_FREE);
//
// Abort the session and re-init it.
|