diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-09-20 11:50:49 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-09-20 11:50:49 -0400 |
| commit | 9600c11ba3602be161cd376f1460f3de561fc299 (patch) | |
| tree | d071c2427a8f7ad601aec6d8ae76b0f61410becf /drivers/scsi/sr.c | |
| parent | 676d55ae30ea3b688f0386f70553489f25f24d55 (diff) | |
| parent | 13e1e1f08c1c098c7574c1fa72bd8c67792dc89b (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-for-linus-2.6
Diffstat (limited to 'drivers/scsi/sr.c')
| -rw-r--r-- | drivers/scsi/sr.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/scsi/sr.c b/drivers/scsi/sr.c index ce63fc8312dc..561901b1cf11 100644 --- a/drivers/scsi/sr.c +++ b/drivers/scsi/sr.c | |||
| @@ -326,6 +326,7 @@ static int sr_init_command(struct scsi_cmnd * SCpnt) | |||
| 326 | return 0; | 326 | return 0; |
| 327 | 327 | ||
| 328 | memcpy(SCpnt->cmnd, rq->cmd, sizeof(SCpnt->cmnd)); | 328 | memcpy(SCpnt->cmnd, rq->cmd, sizeof(SCpnt->cmnd)); |
| 329 | SCpnt->cmd_len = rq->cmd_len; | ||
| 329 | if (!rq->data_len) | 330 | if (!rq->data_len) |
| 330 | SCpnt->sc_data_direction = DMA_NONE; | 331 | SCpnt->sc_data_direction = DMA_NONE; |
| 331 | else if (rq_data_dir(rq) == WRITE) | 332 | else if (rq_data_dir(rq) == WRITE) |