1 files changed, 7 insertions, 0 deletions

diff --git a/drivers/scsi/scsi_error.c b/drivers/scsi/scsi_error.c
index f17aa7aa7879..47a1ffc4c904 100644
--- a/drivers/scsi/scsi_error.c
+++ b/drivers/scsi/scsi_error.c
@@ -1029,6 +1029,7 @@ retry:
                 rtn = NEEDS_RETRY;
         } else {
                 timeleft = wait_for_completion_timeout(&done, timeout);
+                rtn = SUCCESS;
         }
 
         shost->eh_action = NULL;
@@ -2306,6 +2307,12 @@ scsi_reset_provider(struct scsi_device *dev, int flag)
         }
 
         scmd = scsi_get_command(dev, GFP_KERNEL);
+        if (!scmd) {
+                rtn = FAILED;
+                put_device(&dev->sdev_gendev);
+                goto out_put_autopm_host;
+        }
+
         blk_rq_init(NULL, &req);
         scmd->request = &req;