2 files changed, 3 insertions, 4 deletions

diff --git a/drivers/scsi/scsi_lib.c b/drivers/scsi/scsi_lib.c
index 7cbc4127fb5a..d230c699c728 100644
--- a/drivers/scsi/scsi_lib.c
+++ b/drivers/scsi/scsi_lib.c
@@ -360,9 +360,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);
 }
 
 /*
@@ -1425,7 +1425,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;
 
diff --git a/drivers/scsi/scsi_scan.c b/drivers/scsi/scsi_scan.c
index a8a37a338c02..287d197a7c17 100644
--- a/drivers/scsi/scsi_scan.c
+++ b/drivers/scsi/scsi_scan.c
@@ -249,7 +249,6 @@ static struct scsi_device *scsi_alloc_sdev(struct scsi_target *starget,
          */
         sdev->borken = 1;
 
-        spin_lock_init(&sdev->sdev_lock);
         sdev->request_queue = scsi_alloc_queue(sdev);
         if (!sdev->request_queue) {
                 /* release fn is set up in scsi_sysfs_device_initialise, so