diff options
author | Jens Axboe <axboe@suse.de> | 2005-12-09 08:42:16 -0500 |
---|---|---|
committer | James Bottomley <jejb@mulgrave.(none)> | 2005-12-09 13:50:53 -0500 |
commit | a8c730e85e80734412f4f73ab28496a0e8b04a7b (patch) | |
tree | d8e38549f0ac0f51a7123cf37660f9c7f6cae60d /drivers | |
parent | 85631672e6a8032267058b4ccbe53f1924a5d0be (diff) |
[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')
-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) | |||
1215 | } else { | 1215 | } else { |
1216 | memcpy(cmd->cmnd, req->cmd, sizeof(cmd->cmnd)); | 1216 | memcpy(cmd->cmnd, req->cmd, sizeof(cmd->cmnd)); |
1217 | cmd->cmd_len = req->cmd_len; | 1217 | cmd->cmd_len = req->cmd_len; |
1218 | if (rq_data_dir(req) == WRITE) | 1218 | if (!req->data_len) |
1219 | cmd->sc_data_direction = DMA_NONE; | ||
1220 | else if (rq_data_dir(req) == WRITE) | ||
1219 | cmd->sc_data_direction = DMA_TO_DEVICE; | 1221 | cmd->sc_data_direction = DMA_TO_DEVICE; |
1220 | else if (req->data_len) | ||
1221 | cmd->sc_data_direction = DMA_FROM_DEVICE; | ||
1222 | else | 1222 | else |
1223 | cmd->sc_data_direction = DMA_NONE; | 1223 | cmd->sc_data_direction = DMA_FROM_DEVICE; |
1224 | 1224 | ||
1225 | cmd->transfersize = req->data_len; | 1225 | cmd->transfersize = req->data_len; |
1226 | cmd->allowed = 3; | 1226 | cmd->allowed = 3; |