diff options
| author | Dmitry Torokhov <dtor@insightbb.com> | 2006-09-19 01:56:44 -0400 |
|---|---|---|
| committer | Dmitry Torokhov <dtor@insightbb.com> | 2006-09-19 01:56:44 -0400 |
| commit | 0612ec48762bf8712db1925b2e67246d2237ebab (patch) | |
| tree | 01b0d69c9c9915015c0f23ad4263646dd5413e99 /drivers/fc4 | |
| parent | 4263cf0fac28122c8381b6f4f9441a43cd93c81f (diff) | |
| parent | 47a5c6fa0e204a2b63309c648bb2fde36836c826 (diff) | |
Merge rsync://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'drivers/fc4')
| -rw-r--r-- | drivers/fc4/fc.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/fc4/fc.c b/drivers/fc4/fc.c index 66d03f242d3c..1a159e8843ca 100644 --- a/drivers/fc4/fc.c +++ b/drivers/fc4/fc.c | |||
| @@ -429,7 +429,7 @@ static inline void fcp_scsi_receive(fc_channel *fc, int token, int status, fc_hd | |||
| 429 | 429 | ||
| 430 | if (fcmd->data) { | 430 | if (fcmd->data) { |
| 431 | if (SCpnt->use_sg) | 431 | if (SCpnt->use_sg) |
| 432 | dma_unmap_sg(fc->dev, (struct scatterlist *)SCpnt->buffer, | 432 | dma_unmap_sg(fc->dev, (struct scatterlist *)SCpnt->request_buffer, |
| 433 | SCpnt->use_sg, | 433 | SCpnt->use_sg, |
| 434 | SCpnt->sc_data_direction); | 434 | SCpnt->sc_data_direction); |
| 435 | else | 435 | else |
| @@ -810,7 +810,7 @@ static int fcp_scsi_queue_it(fc_channel *fc, Scsi_Cmnd *SCpnt, fcp_cmnd *fcmd, i | |||
| 810 | SCpnt->request_bufflen, | 810 | SCpnt->request_bufflen, |
| 811 | SCpnt->sc_data_direction); | 811 | SCpnt->sc_data_direction); |
| 812 | } else { | 812 | } else { |
| 813 | struct scatterlist *sg = (struct scatterlist *)SCpnt->buffer; | 813 | struct scatterlist *sg = (struct scatterlist *)SCpnt->request_buffer; |
| 814 | int nents; | 814 | int nents; |
| 815 | 815 | ||
| 816 | FCD(("XXX: Use_sg %d %d\n", SCpnt->use_sg, sg->length)) | 816 | FCD(("XXX: Use_sg %d %d\n", SCpnt->use_sg, sg->length)) |