Skip to content

Commit

Permalink
Revert "[SCSI] fix usb storage oops"
Browse files Browse the repository at this point in the history
This reverts commit 34ea80e.

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>
  • Loading branch information
Linus Torvalds committed Dec 2, 2005
1 parent 2741049 commit 1b0997f
Showing 1 changed file with 1 addition and 8 deletions.
9 changes: 1 addition & 8 deletions drivers/scsi/scsi_lib.c
Expand Up @@ -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)
Expand Down

0 comments on commit 1b0997f

Please sign in to comment.