diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-03-13 20:55:15 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-03-13 20:55:15 +0000 |
| commit | 1471f525455788c20b130690e0f104df451aeb43 (patch) | |
| tree | 3778beba56558beb9a9548ea5b467e9c44ea966f /drivers/scsi | |
| parent | e80d2c5456d30ebba5b0eb8a9d33e17d815d4d83 (diff) | |
Merge with Linux 2.3.51.
Diffstat (limited to 'drivers/scsi')
| -rw-r--r-- | drivers/scsi/3w-xxxx.c | 4 | ||||
| -rw-r--r-- | drivers/scsi/Config.in | 4 | ||||
| -rw-r--r-- | drivers/scsi/aic7xxx.c | 2 | ||||
| -rw-r--r-- | drivers/scsi/scsi_dma.c | 2 |
4 files changed, 6 insertions, 6 deletions
diff --git a/drivers/scsi/3w-xxxx.c b/drivers/scsi/3w-xxxx.c index 42b86930d..31adb57fa 100644 --- a/drivers/scsi/3w-xxxx.c +++ b/drivers/scsi/3w-xxxx.c @@ -85,7 +85,7 @@ static void tw_copy_mem_info(TW_Info *info, char *data, int len); static void tw_interrupt(int irq, void *dev_instance, struct pt_regs *regs); /* Globals */ -char *tw_driver_version="1.0.000"; +char *tw_driver_version="1.1.000"; TW_Device_Extension *tw_device_extension_list[TW_MAX_SLOT]; int tw_device_extension_count = 0; @@ -2051,7 +2051,7 @@ int tw_scsiop_read_write(TW_Device_Extension *tw_dev, int request_id) command_packet->status = 0; command_packet->flags = 0; - if ((srb->cmnd[0] == WRITE_6) || (srb->cmnd[0] == WRITE_10)) { + if (srb->cmnd[0] == WRITE_10) { if ((srb->cmnd[1] & 0x8) || (srb->cmnd[1] & 0x10)) command_packet->flags = 1; } diff --git a/drivers/scsi/Config.in b/drivers/scsi/Config.in index 4395cd682..4b68450e4 100644 --- a/drivers/scsi/Config.in +++ b/drivers/scsi/Config.in @@ -54,8 +54,8 @@ if [ "$CONFIG_DECSTATION" = "y" ]; then dep_tristate 'DEC SII Scsi Driver' CONFIG_SCSI_DECSII $CONFIG_SCSI fi -if [ "$CONFIG_EXPERIMENTAL" = "y" ]; then - dep_tristate '3ware Hardware ATA-RAID support (EXPERIMENTAL)' CONFIG_BLK_DEV_3W_XXXX_RAID $CONFIG_SCSI +if [ "$CONFIG_PCI" = "y" ]; then + dep_tristate '3ware Hardware ATA-RAID support' CONFIG_BLK_DEV_3W_XXXX_RAID $CONFIG_SCSI fi dep_tristate '7000FASST SCSI support' CONFIG_SCSI_7000FASST $CONFIG_SCSI dep_tristate 'ACARD SCSI support' CONFIG_SCSI_ACARD $CONFIG_SCSI diff --git a/drivers/scsi/aic7xxx.c b/drivers/scsi/aic7xxx.c index 6ca7147d5..40ccb2fa8 100644 --- a/drivers/scsi/aic7xxx.c +++ b/drivers/scsi/aic7xxx.c @@ -956,7 +956,7 @@ typedef struct { unsigned char numscbs; /* current number of scbs */ unsigned char maxhscbs; /* hardware scbs */ unsigned char maxscbs; /* max scbs including pageable scbs */ - unsigned int hscbs_dma; /* DMA handle to hscbs */ + dma_addr_t hscbs_dma; /* DMA handle to hscbs */ unsigned int hscbs_dma_len; /* length of the above DMA area */ void *hscb_kmalloc_ptr; } scb_data_type; diff --git a/drivers/scsi/scsi_dma.c b/drivers/scsi/scsi_dma.c index c0eb4baa0..ccb366593 100644 --- a/drivers/scsi/scsi_dma.c +++ b/drivers/scsi/scsi_dma.c @@ -147,7 +147,7 @@ int scsi_free(void *obj, unsigned int len) nbits = len >> 9; mask = (1 << nbits) - 1; - if ((mask << sector) >= (1 << SECTORS_PER_PAGE)) + if (sector + nbits > SECTORS_PER_PAGE) panic("scsi_free:Bad memory alignment"); if ((dma_malloc_freelist[page] & |