diff options
| author | Boaz Harrosh <bharrosh@panasas.com> | 2007-09-09 21:14:41 +0300 |
|---|---|---|
| committer | James Bottomley <James.Bottomley@HansenPartnership.com> | 2008-01-11 18:22:36 -0600 |
| commit | 53d2a885032411b471b393d065c7b4693fbaafb4 (patch) | |
| tree | d93c8b771b11906c0422b7240e81f4689ecdc9c5 | |
| parent | dfb104ff5d8215e09892aad3cd094ad6597b1cfe (diff) | |
| download | linux-3.10-53d2a885032411b471b393d065c7b4693fbaafb4.tar.gz linux-3.10-53d2a885032411b471b393d065c7b4693fbaafb4.tar.bz2 linux-3.10-53d2a885032411b471b393d065c7b4693fbaafb4.zip | |
[SCSI] in2000: convert to accessors and !use_sg cleanup
- convert to accessors and !use_sg cleanup
Signed-off-by: Boaz Harrosh <bharrosh@panasas.com>
Signed-off-by: James Bottomley <James.Bottomley@HansenPartnership.com>
| -rw-r--r-- | drivers/scsi/in2000.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/scsi/in2000.c b/drivers/scsi/in2000.c index c8b452f2878..8053b1e86cc 100644 --- a/drivers/scsi/in2000.c +++ b/drivers/scsi/in2000.c @@ -369,16 +369,16 @@ static int in2000_queuecommand(Scsi_Cmnd * cmd, void (*done) (Scsi_Cmnd *)) * - SCp.phase records this command's SRCID_ER bit setting */ - if (cmd->use_sg) { - cmd->SCp.buffer = (struct scatterlist *) cmd->request_buffer; - cmd->SCp.buffers_residual = cmd->use_sg - 1; + if (scsi_bufflen(cmd)) { + cmd->SCp.buffer = scsi_sglist(cmd); + cmd->SCp.buffers_residual = scsi_sg_count(cmd) - 1; cmd->SCp.ptr = sg_virt(cmd->SCp.buffer); cmd->SCp.this_residual = cmd->SCp.buffer->length; } else { cmd->SCp.buffer = NULL; cmd->SCp.buffers_residual = 0; - cmd->SCp.ptr = (char *) cmd->request_buffer; - cmd->SCp.this_residual = cmd->request_bufflen; + cmd->SCp.ptr = NULL; + cmd->SCp.this_residual = 0; } cmd->SCp.have_data_in = 0; |