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/st.c | |
| parent | d3e4cefc86ce1aefc0e9aebdc56308cb4bd51997 (diff) | |
| parent | 7116317dc9148d783846299fc80a7d377baa6dca (diff) | |
Auto-update from upstream
Diffstat (limited to 'drivers/scsi/st.c')
| -rw-r--r-- | drivers/scsi/st.c | 19 |
1 files changed, 1 insertions, 18 deletions
diff --git a/drivers/scsi/st.c b/drivers/scsi/st.c index 7ac6ea141ff..dd592f6a252 100644 --- a/drivers/scsi/st.c +++ b/drivers/scsi/st.c @@ -4194,27 +4194,10 @@ static void st_intr(struct scsi_cmnd *SCpnt) */ static int st_init_command(struct scsi_cmnd *SCpnt) { - struct request *rq; - if (!(SCpnt->request->flags & REQ_BLOCK_PC)) return 0; - rq = SCpnt->request; - 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; - - SCpnt->timeout_per_command = rq->timeout; - SCpnt->transfersize = rq->data_len; + scsi_setup_blk_pc_cmnd(SCpnt, 0); SCpnt->done = st_intr; return 1; } |