diff options
Diffstat (limited to 'drivers/block')
-rw-r--r-- | drivers/block/cciss_scsi.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/block/cciss_scsi.c b/drivers/block/cciss_scsi.c index 597c007fe81b..afdff32f6724 100644 --- a/drivers/block/cciss_scsi.c +++ b/drivers/block/cciss_scsi.c | |||
@@ -578,7 +578,7 @@ complete_scsi_command( CommandList_struct *cp, int timeout, __u32 tag) | |||
578 | 578 | ||
579 | if (cmd->use_sg) { | 579 | if (cmd->use_sg) { |
580 | pci_unmap_sg(ctlr->pdev, | 580 | pci_unmap_sg(ctlr->pdev, |
581 | cmd->buffer, cmd->use_sg, | 581 | cmd->request_buffer, cmd->use_sg, |
582 | cmd->sc_data_direction); | 582 | cmd->sc_data_direction); |
583 | } | 583 | } |
584 | else if (cmd->request_bufflen) { | 584 | else if (cmd->request_bufflen) { |
@@ -1210,7 +1210,7 @@ cciss_scatter_gather(struct pci_dev *pdev, | |||
1210 | struct scsi_cmnd *cmd) | 1210 | struct scsi_cmnd *cmd) |
1211 | { | 1211 | { |
1212 | unsigned int use_sg, nsegs=0, len; | 1212 | unsigned int use_sg, nsegs=0, len; |
1213 | struct scatterlist *scatter = (struct scatterlist *) cmd->buffer; | 1213 | struct scatterlist *scatter = (struct scatterlist *) cmd->request_buffer; |
1214 | __u64 addr64; | 1214 | __u64 addr64; |
1215 | 1215 | ||
1216 | /* is it just one virtual address? */ | 1216 | /* is it just one virtual address? */ |
@@ -1232,7 +1232,7 @@ cciss_scatter_gather(struct pci_dev *pdev, | |||
1232 | } /* else, must be a list of virtual addresses.... */ | 1232 | } /* else, must be a list of virtual addresses.... */ |
1233 | else if (cmd->use_sg <= MAXSGENTRIES) { /* not too many addrs? */ | 1233 | else if (cmd->use_sg <= MAXSGENTRIES) { /* not too many addrs? */ |
1234 | 1234 | ||
1235 | use_sg = pci_map_sg(pdev, cmd->buffer, cmd->use_sg, | 1235 | use_sg = pci_map_sg(pdev, cmd->request_buffer, cmd->use_sg, |
1236 | cmd->sc_data_direction); | 1236 | cmd->sc_data_direction); |
1237 | 1237 | ||
1238 | for (nsegs=0; nsegs < use_sg; nsegs++) { | 1238 | for (nsegs=0; nsegs < use_sg; nsegs++) { |