diff --git a/drivers/scsi/scsi_sysfs.c b/drivers/scsi/scsi_sysfs.c
index 70b2e3a1abc7afd07687c1c5ed6e951e06b532c5..a37654820d4071496b1f8e58e42e505d0879c93c 100644
--- a/drivers/scsi/scsi_sysfs.c
+++ b/drivers/scsi/scsi_sysfs.c
@@ -770,16 +770,10 @@ store_state_field(struct device *dev, struct device_attribute *attr,
 	 */
 	if ((ret == 0) && (state == SDEV_RUNNING) &&
 	    (sdev->request_queue->mq_ops != NULL))
-		goto out_run_hw_queue;
+		blk_mq_run_hw_queues(sdev->request_queue, true);
 	mutex_unlock(&sdev->state_mutex);
 
 	return ret == 0 ? count : -EINVAL;
-
-out_run_hw_queue:
-	mutex_unlock(&sdev->state_mutex);
-	blk_mq_run_hw_queues(sdev->request_queue, true);
-
-	return count;
 }
 
 static ssize_t