Merge with /pub/scm/linux/kernel/git/torvalds/linux-2.6.git

Signed-off-by: Steve French <sfrench@us.ibm.com>

1 files changed, 1 insertions, 8 deletions

diff --git a/drivers/scsi/scsi_lib.c b/drivers/scsi/scsi_lib.c
index ce9d73a292e2..4afef5cdcb17 100644
--- a/drivers/scsi/scsi_lib.c
+++ b/drivers/scsi/scsi_lib.c
@@ -542,17 +542,10 @@ static void scsi_requeue_command(struct request_queue *q, struct scsi_cmnd *cmd)
 
 void scsi_next_command(struct scsi_cmnd *cmd)
 {
-        struct scsi_device *sdev = cmd->device;
-        struct request_queue *q = sdev->request_queue;
-
-        /* need to hold a reference on the device before we let go of the cmd */
-        get_device(&sdev->sdev_gendev);
+        struct request_queue *q = cmd->device->request_queue;
 
         scsi_put_command(cmd);
         scsi_run_queue(q);
-
-        /* ok to remove device now */
-        put_device(&sdev->sdev_gendev);
 }
 
 void scsi_run_host_queues(struct Scsi_Host *shost)