From 70ed951571432d3eed9aa43816a4f38aed14880d Mon Sep 17 00:00:00 2001 From: "goggin, edward" Date: Tue, 8 Nov 2005 15:02:23 -0500 Subject: [PATCH] --- yaml --- r: 13946 b: refs/heads/master c: 34ea80ec6a02ad02e6b9c75c478c18e5880d6713 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/scsi/scsi_lib.c | 9 ++++++++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 37108fc7fe4a..c006fba1082b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 383f9749505cef0a30dbd7109db7fe469aa64753 +refs/heads/master: 34ea80ec6a02ad02e6b9c75c478c18e5880d6713 diff --git a/trunk/drivers/scsi/scsi_lib.c b/trunk/drivers/scsi/scsi_lib.c index 4afef5cdcb17..ce9d73a292e2 100644 --- a/trunk/drivers/scsi/scsi_lib.c +++ b/trunk/drivers/scsi/scsi_lib.c @@ -542,10 +542,17 @@ static void scsi_requeue_command(struct request_queue *q, struct scsi_cmnd *cmd) void scsi_next_command(struct scsi_cmnd *cmd) { - struct request_queue *q = cmd->device->request_queue; + 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); 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)