diff options
Diffstat (limited to 'drivers/scsi/scsi_lib.c')
| -rw-r--r-- | drivers/scsi/scsi_lib.c | 7 | 
1 files changed, 3 insertions, 4 deletions
| diff --git a/drivers/scsi/scsi_lib.c b/drivers/scsi/scsi_lib.c index 2e28e2360c85..5b3230ef51fe 100644 --- a/drivers/scsi/scsi_lib.c +++ b/drivers/scsi/scsi_lib.c @@ -635,10 +635,9 @@ static bool scsi_end_request(struct request *req, blk_status_t error,  	if (blk_queue_add_random(q))  		add_disk_randomness(req->q->disk); -	if (!blk_rq_is_passthrough(req)) { -		WARN_ON_ONCE(!(cmd->flags & SCMD_INITIALIZED)); -		cmd->flags &= ~SCMD_INITIALIZED; -	} +	WARN_ON_ONCE(!blk_rq_is_passthrough(req) && +		     !(cmd->flags & SCMD_INITIALIZED)); +	cmd->flags = 0;  	/*  	 * Calling rcu_barrier() is not necessary here because the | 
