diff options
| author | Christoph Hellwig <hch@lst.de> | 2014-06-25 19:51:41 -0600 |
|---|---|---|
| committer | Jens Axboe <axboe@fb.com> | 2015-04-02 12:12:25 -0600 |
| commit | 62e96dad1fb3e2ccaad66bab3977b9dcac8ba46c (patch) | |
| tree | 8f94d8298cf6fb994ea331649ba6098c75972058 | |
| parent | 343a6c212de4e0b445d8b3b7882066d2f5e37135 (diff) | |
scsi: handle command allocation failure in scsi_reset_provider
Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Nicholas Bellinger <nab@linux-iscsi.org>
Reviewed-by: Mike Christie <michaelc@cs.wisc.edu>
Reviewed-by: Hannes Reinecke <hare@suse.de>
| -rw-r--r-- | drivers/scsi/scsi_error.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/drivers/scsi/scsi_error.c b/drivers/scsi/scsi_error.c index c1e4a749ddc5..391dafd7101d 100644 --- a/drivers/scsi/scsi_error.c +++ b/drivers/scsi/scsi_error.c @@ -2000,6 +2000,12 @@ scsi_reset_provider(struct scsi_device *dev, int flag) return FAILED; 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; @@ -2056,6 +2062,7 @@ scsi_reset_provider(struct scsi_device *dev, int flag) scsi_run_host_queues(shost); scsi_next_command(scmd); +out_put_autopm_host: scsi_autopm_put_host(shost); return rtn; } |