diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-12-02 15:54:37 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-12-02 15:54:37 -0800 |
| commit | 1b0997f561bf46689cc6e0903f342e9bf2506bf1 (patch) | |
| tree | 58b86f7f1eb8710a16f6e6d54a6eaf38fb23711c /drivers | |
| parent | 2741049e66d9698da5e0c90c849406fa3d3fc45c (diff) | |
| download | linux-1b0997f561bf46689cc6e0903f342e9bf2506bf1.tar.gz linux-1b0997f561bf46689cc6e0903f342e9bf2506bf1.tar.bz2 linux-1b0997f561bf46689cc6e0903f342e9bf2506bf1.zip | |
Revert "[SCSI] fix usb storage oops"
This reverts commit 34ea80ec6a02ad02e6b9c75c478c18e5880d6713.
It does a put_device() from softirq context, which is bad since it gets
a semaphore for reading.
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'drivers')
| -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) 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) |