diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-07-21 15:04:53 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-07-21 15:04:53 -0400 |
| commit | 00ab956f2fefd3673edc16df55beed21834b7bdd (patch) | |
| tree | b703a595bbedaccd63b30d048b2f1cbc32ce0519 /drivers/fc4/fc.c | |
| parent | 53a4998229efbf5cb79ec7ca7c18f4c86f66755d (diff) | |
| parent | 79bd3f8563a275d1d068bbb9189a746dc6e96f3e (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6
* master.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6: (38 commits)
[SCSI] More buffer->request_buffer changes
[SCSI] mptfusion: bump version to 3.04.01
[SCSI] mptfusion: misc fix's
[SCSI] mptfusion: firmware download boot fix's
[SCSI] mptfusion: task abort fix's
[SCSI] mptfusion: sas nexus loss support
[SCSI] mptfusion: sas loginfo update
[SCSI] mptfusion: mptctl panic when loading
[SCSI] mptfusion: sas enclosures with smart drive
[SCSI] NCR_D700: misc fixes (section and argument ordering)
[SCSI] scsi_debug: must_check fixes
[SCSI] scsi_transport_sas: kill the use of channel
[SCSI] scsi_transport_sas: add expander backlink
[SCSI] hide EH backup data outside the scsi_cmnd
[SCSI] ibmvscsi: handle inactive SCSI target during probe
[SCSI] ibmvscsi: allocate lpevents for ibmvscsi on iseries
[SCSI] aic7[9x]xx: Remove last vestiges of reverse_scan
[SCSI] aha152x: stop poking at saved scsi_cmnd members
[SCSI] st.c: Improve sense output
[SCSI] lpfc 8.1.7: Change version number to 8.1.7
...
Diffstat (limited to 'drivers/fc4/fc.c')
| -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)) |