1 files changed, 3 insertions, 3 deletions

diff --git a/drivers/scsi/scsi_lib.c b/drivers/scsi/scsi_lib.c
index 619d3fb7a2f0..d18da21c9c57 100644
--- a/drivers/scsi/scsi_lib.c
+++ b/drivers/scsi/scsi_lib.c
@@ -358,9 +358,9 @@ void scsi_device_unbusy(struct scsi_device *sdev)
                      shost->host_failed))
                 scsi_eh_wakeup(shost);
         spin_unlock(shost->host_lock);
-        spin_lock(&sdev->sdev_lock);
+        spin_lock(sdev->request_queue->queue_lock);
         sdev->device_busy--;
-        spin_unlock_irqrestore(&sdev->sdev_lock, flags);
+        spin_unlock_irqrestore(sdev->request_queue->queue_lock, flags);
 }
 
 /*
@@ -1423,7 +1423,7 @@ struct request_queue *scsi_alloc_queue(struct scsi_device *sdev)
         struct Scsi_Host *shost = sdev->host;
         struct request_queue *q;
 
-        q = blk_init_queue(scsi_request_fn, &sdev->sdev_lock);
+        q = blk_init_queue(scsi_request_fn, NULL);
         if (!q)
                 return NULL;