1 files changed, 3 insertions, 2 deletions

diff --git a/drivers/scsi/scsi_lib.c b/drivers/scsi/scsi_lib.c
index a33b2b66da67..ead6405f3e51 100644
--- a/drivers/scsi/scsi_lib.c
+++ b/drivers/scsi/scsi_lib.c
@@ -682,11 +682,11 @@ static int __scsi_error_from_host_byte(struct scsi_cmnd *cmd, int result)
                 error = -ENOLINK;
                 break;
         case DID_TARGET_FAILURE:
-                cmd->result |= (DID_OK << 16);
+                set_host_byte(cmd, DID_OK);
                 error = -EREMOTEIO;
                 break;
         case DID_NEXUS_FAILURE:
-                cmd->result |= (DID_OK << 16);
+                set_host_byte(cmd, DID_OK);
                 error = -EBADE;
                 break;
         default:
@@ -880,6 +880,7 @@ void scsi_io_completion(struct scsi_cmnd *cmd, unsigned int good_bytes)
                                     cmd->cmnd[0] == WRITE_SAME)) {
                                 description = "Discard failure";
                                 action = ACTION_FAIL;
+                                error = -EREMOTEIO;
                         } else
                                 action = ACTION_FAIL;
                         break;