diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-07-24 03:38:25 -0400 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-07-24 03:38:25 -0400 |
| commit | 48cb37bd9e053429aacb7c2726da3300aba60c68 (patch) | |
| tree | b96346400d0d36557d683bc1535ed5139f9ca76d /drivers/scsi/sun3_NCR5380.c | |
| parent | e36fcd8ae611b91f0bbaf6063b0b98e1ef955880 (diff) | |
| parent | b71426eb10d904d421b36f51f93c8d0ba558edac (diff) | |
Merge branch 'upstream-fixes' into upstream
Diffstat (limited to 'drivers/scsi/sun3_NCR5380.c')
| -rw-r--r-- | drivers/scsi/sun3_NCR5380.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/scsi/sun3_NCR5380.c b/drivers/scsi/sun3_NCR5380.c index 2ebe0d663899..2f8073b73bf3 100644 --- a/drivers/scsi/sun3_NCR5380.c +++ b/drivers/scsi/sun3_NCR5380.c | |||
| @@ -517,7 +517,7 @@ static __inline__ void initialize_SCp(Scsi_Cmnd *cmd) | |||
| 517 | */ | 517 | */ |
| 518 | 518 | ||
| 519 | if (cmd->use_sg) { | 519 | if (cmd->use_sg) { |
| 520 | cmd->SCp.buffer = (struct scatterlist *) cmd->buffer; | 520 | cmd->SCp.buffer = (struct scatterlist *) cmd->request_buffer; |
| 521 | cmd->SCp.buffers_residual = cmd->use_sg - 1; | 521 | cmd->SCp.buffers_residual = cmd->use_sg - 1; |
| 522 | cmd->SCp.ptr = (char *) SGADDR(cmd->SCp.buffer); | 522 | cmd->SCp.ptr = (char *) SGADDR(cmd->SCp.buffer); |
| 523 | cmd->SCp.this_residual = cmd->SCp.buffer->length; | 523 | cmd->SCp.this_residual = cmd->SCp.buffer->length; |