diff options
| author | Jens Axboe <axboe@suse.de> | 2005-12-09 14:42:16 +0100 |
|---|---|---|
| committer | James Bottomley <jejb@mulgrave.(none)> | 2005-12-09 13:50:53 -0500 |
| commit | a8c730e85e80734412f4f73ab28496a0e8b04a7b (patch) | |
| tree | d8e38549f0ac0f51a7123cf37660f9c7f6cae60d /drivers/scsi | |
| parent | 85631672e6a8032267058b4ccbe53f1924a5d0be (diff) | |
| download | lwn-a8c730e85e80734412f4f73ab28496a0e8b04a7b.tar.gz lwn-a8c730e85e80734412f4f73ab28496a0e8b04a7b.zip | |
[SCSI] fix panic when ejecting ieee1394 ipod
The scsi_library routines don't correctly set DMA_NONE when
req->data_len is zero (instead they check the command type first, so
if it's write, we end up with req->data_len == 0 and direction as
DMA_TO_DEVICE which confuses some drivers)
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
Diffstat (limited to 'drivers/scsi')
| -rw-r--r-- | drivers/scsi/scsi_lib.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/scsi/scsi_lib.c b/drivers/scsi/scsi_lib.c index 4afef5cdcb17..097888721ec4 100644 --- a/drivers/scsi/scsi_lib.c +++ b/drivers/scsi/scsi_lib.c @@ -1215,12 +1215,12 @@ static int scsi_prep_fn(struct request_queue *q, struct request *req) } else { memcpy(cmd->cmnd, req->cmd, sizeof(cmd->cmnd)); cmd->cmd_len = req->cmd_len; - if (rq_data_dir(req) == WRITE) + if (!req->data_len) + cmd->sc_data_direction = DMA_NONE; + else if (rq_data_dir(req) == WRITE) cmd->sc_data_direction = DMA_TO_DEVICE; - else if (req->data_len) - cmd->sc_data_direction = DMA_FROM_DEVICE; else - cmd->sc_data_direction = DMA_NONE; + cmd->sc_data_direction = DMA_FROM_DEVICE; cmd->transfersize = req->data_len; cmd->allowed = 3; |