diff options
Diffstat (limited to 'drivers/scsi')
-rw-r--r-- | drivers/scsi/3w-9xxx.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/scsi/3w-9xxx.c b/drivers/scsi/3w-9xxx.c index 31c497542272..d9152d02088c 100644 --- a/drivers/scsi/3w-9xxx.c +++ b/drivers/scsi/3w-9xxx.c | |||
@@ -61,6 +61,7 @@ | |||
61 | Add support for embedded firmware error strings. | 61 | Add support for embedded firmware error strings. |
62 | 2.26.02.003 - Correctly handle single sgl's with use_sg=1. | 62 | 2.26.02.003 - Correctly handle single sgl's with use_sg=1. |
63 | 2.26.02.004 - Add support for 9550SX controllers. | 63 | 2.26.02.004 - Add support for 9550SX controllers. |
64 | 2.26.02.005 - Fix use_sg == 0 mapping on systems with 4GB or higher. | ||
64 | */ | 65 | */ |
65 | 66 | ||
66 | #include <linux/module.h> | 67 | #include <linux/module.h> |
@@ -84,7 +85,7 @@ | |||
84 | #include "3w-9xxx.h" | 85 | #include "3w-9xxx.h" |
85 | 86 | ||
86 | /* Globals */ | 87 | /* Globals */ |
87 | #define TW_DRIVER_VERSION "2.26.02.004" | 88 | #define TW_DRIVER_VERSION "2.26.02.005" |
88 | static TW_Device_Extension *twa_device_extension_list[TW_MAX_SLOT]; | 89 | static TW_Device_Extension *twa_device_extension_list[TW_MAX_SLOT]; |
89 | static unsigned int twa_device_extension_count; | 90 | static unsigned int twa_device_extension_count; |
90 | static int twa_major = -1; | 91 | static int twa_major = -1; |
@@ -1408,7 +1409,7 @@ static dma_addr_t twa_map_scsi_single_data(TW_Device_Extension *tw_dev, int requ | |||
1408 | dma_addr_t mapping; | 1409 | dma_addr_t mapping; |
1409 | struct scsi_cmnd *cmd = tw_dev->srb[request_id]; | 1410 | struct scsi_cmnd *cmd = tw_dev->srb[request_id]; |
1410 | struct pci_dev *pdev = tw_dev->tw_pci_dev; | 1411 | struct pci_dev *pdev = tw_dev->tw_pci_dev; |
1411 | int retval = 0; | 1412 | dma_addr_t retval = 0; |
1412 | 1413 | ||
1413 | if (cmd->request_bufflen == 0) { | 1414 | if (cmd->request_bufflen == 0) { |
1414 | retval = 0; | 1415 | retval = 0; |
@@ -1798,7 +1799,7 @@ static int twa_scsiop_execute_scsi(TW_Device_Extension *tw_dev, int request_id, | |||
1798 | int i, sg_count; | 1799 | int i, sg_count; |
1799 | struct scsi_cmnd *srb = NULL; | 1800 | struct scsi_cmnd *srb = NULL; |
1800 | struct scatterlist *sglist = NULL; | 1801 | struct scatterlist *sglist = NULL; |
1801 | u32 buffaddr = 0x0; | 1802 | dma_addr_t buffaddr = 0x0; |
1802 | int retval = 1; | 1803 | int retval = 1; |
1803 | 1804 | ||
1804 | if (tw_dev->srb[request_id]) { | 1805 | if (tw_dev->srb[request_id]) { |