diff options
author | Tony Luck <tony.luck@intel.com> | 2005-12-05 14:50:17 -0500 |
---|---|---|
committer | Tony Luck <tony.luck@intel.com> | 2005-12-05 14:50:17 -0500 |
commit | 3e356b2660eda9da7776144cbc0a038c93dcb335 (patch) | |
tree | 378a38636f6b67a5f092a73850223d11cdfb5ff5 /drivers/scsi/scsi_lib.c | |
parent | 05f70395c642bed0300bc1955bfa8c0f93de2bc2 (diff) | |
parent | e4f5c82a92c2a546a16af1614114eec19120e40a (diff) |
Auto-update from upstream
Diffstat (limited to 'drivers/scsi/scsi_lib.c')
-rw-r--r-- | drivers/scsi/scsi_lib.c | 9 |
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) | |||
542 | 542 | ||
543 | void scsi_next_command(struct scsi_cmnd *cmd) | 543 | void scsi_next_command(struct scsi_cmnd *cmd) |
544 | { | 544 | { |
545 | struct scsi_device *sdev = cmd->device; | 545 | struct request_queue *q = cmd->device->request_queue; |
546 | struct request_queue *q = sdev->request_queue; | ||
547 | |||
548 | /* need to hold a reference on the device before we let go of the cmd */ | ||
549 | get_device(&sdev->sdev_gendev); | ||
550 | 546 | ||
551 | scsi_put_command(cmd); | 547 | scsi_put_command(cmd); |
552 | scsi_run_queue(q); | 548 | scsi_run_queue(q); |
553 | |||
554 | /* ok to remove device now */ | ||
555 | put_device(&sdev->sdev_gendev); | ||
556 | } | 549 | } |
557 | 550 | ||
558 | void scsi_run_host_queues(struct Scsi_Host *shost) | 551 | void scsi_run_host_queues(struct Scsi_Host *shost) |