Update LUN handling

uweseimet · Jan 23, 2024 · 2ab78f6 · 2ab78f6
1 parent 3dee5dd
commit 2ab78f6
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/cpp/controllers/generic_controller.cpp b/cpp/controllers/generic_controller.cpp
@@ -144,18 +144,19 @@ void GenericController::Execute()
     ResetOffset();
     SetBlocks(1);
 
-    int lun = GetEffectiveLun();
 
     // Discard pending sense data from the previous command if the current command is not REQUEST SENSE
     if (GetOpcode() != scsi_command::cmd_request_sense) {
         SetStatus(status::good);
 
+        int lun = GetEffectiveLun();
         if (!HasDeviceForLun(lun)) {
             lun = 0;
         }
         GetDeviceForLun(lun)->SetStatusCode(0);
     }
 
+    int lun = GetEffectiveLun();
     if (!HasDeviceForLun(lun)) {
         if (GetOpcode() != scsi_command::cmd_inquiry && GetOpcode() != scsi_command::cmd_request_sense) {
             LogTrace(fmt::format("Invalid LUN {}", lun));