diff options
| author | Len Brown <len.brown@intel.com> | 2005-12-15 13:15:27 -0500 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2005-12-15 13:15:27 -0500 |
| commit | 5b2db367a28c12e8dfd0b404d9ea35e948c5d7b3 (patch) | |
| tree | 8ef2f739fc91acda0fb05797cb450b5789d79c59 /drivers/scsi/sd.c | |
| parent | d3e4cefc86ce1aefc0e9aebdc56308cb4bd51997 (diff) | |
| parent | 7116317dc9148d783846299fc80a7d377baa6dca (diff) | |
Auto-update from upstream
Diffstat (limited to 'drivers/scsi/sd.c')
| -rw-r--r-- | drivers/scsi/sd.c | 16 |
1 files changed, 1 insertions, 15 deletions
diff --git a/drivers/scsi/sd.c b/drivers/scsi/sd.c index 8613a131771..03fcbab3003 100644 --- a/drivers/scsi/sd.c +++ b/drivers/scsi/sd.c @@ -245,24 +245,10 @@ static int sd_init_command(struct scsi_cmnd * SCpnt) * SG_IO from block layer already setup, just copy cdb basically */ if (blk_pc_request(rq)) { - if (sizeof(rq->cmd) > sizeof(SCpnt->cmnd)) - return 0; - - memcpy(SCpnt->cmnd, rq->cmd, sizeof(SCpnt->cmnd)); - SCpnt->cmd_len = rq->cmd_len; - if (rq_data_dir(rq) == WRITE) - SCpnt->sc_data_direction = DMA_TO_DEVICE; - else if (rq->data_len) - SCpnt->sc_data_direction = DMA_FROM_DEVICE; - else - SCpnt->sc_data_direction = DMA_NONE; - - this_count = rq->data_len; + scsi_setup_blk_pc_cmnd(SCpnt, SD_PASSTHROUGH_RETRIES); if (rq->timeout) timeout = rq->timeout; - SCpnt->transfersize = rq->data_len; - SCpnt->allowed = SD_PASSTHROUGH_RETRIES; goto queue; } |