git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
reiserfs: add locking around error buffer
[safe/jmp/linux-2.6]
/
drivers
/
scsi
/
aic7xxx_old.c
diff --git
a/drivers/scsi/aic7xxx_old.c
b/drivers/scsi/aic7xxx_old.c
index
2b402fa
..
93984c9
100644
(file)
--- a/
drivers/scsi/aic7xxx_old.c
+++ b/
drivers/scsi/aic7xxx_old.c
@@
-2696,7
+2696,7
@@
aic7xxx_done(struct aic7xxx_host *p, struct aic7xxx_scb *scb)
{
pci_unmap_single(p->pdev,
le32_to_cpu(scb->sg_list[0].address),
{
pci_unmap_single(p->pdev,
le32_to_cpu(scb->sg_list[0].address),
-
sizeof(cmd->sense_buffer)
,
+
SCSI_SENSE_BUFFERSIZE
,
PCI_DMA_FROMDEVICE);
}
if (scb->flags & SCB_RECOVERY_SCB)
PCI_DMA_FROMDEVICE);
}
if (scb->flags & SCB_RECOVERY_SCB)
@@
-4267,13
+4267,13
@@
aic7xxx_handle_seqint(struct aic7xxx_host *p, unsigned char intstat)
sizeof(generic_sense));
scb->sense_cmd[1] = (cmd->device->lun << 5);
sizeof(generic_sense));
scb->sense_cmd[1] = (cmd->device->lun << 5);
- scb->sense_cmd[4] =
sizeof(cmd->sense_buffer)
;
+ scb->sense_cmd[4] =
SCSI_SENSE_BUFFERSIZE
;
scb->sg_list[0].length =
scb->sg_list[0].length =
- cpu_to_le32(
sizeof(cmd->sense_buffer)
);
+ cpu_to_le32(
SCSI_SENSE_BUFFERSIZE
);
scb->sg_list[0].address =
cpu_to_le32(pci_map_single(p->pdev, cmd->sense_buffer,
scb->sg_list[0].address =
cpu_to_le32(pci_map_single(p->pdev, cmd->sense_buffer,
-
sizeof(cmd->sense_buffer)
,
+
SCSI_SENSE_BUFFERSIZE
,
PCI_DMA_FROMDEVICE));
/*
PCI_DMA_FROMDEVICE));
/*
@@
-4296,7
+4296,7
@@
aic7xxx_handle_seqint(struct aic7xxx_host *p, unsigned char intstat)
hscb->residual_data_count[2] = 0;
scb->sg_count = hscb->SG_segment_count = 1;
hscb->residual_data_count[2] = 0;
scb->sg_count = hscb->SG_segment_count = 1;
- scb->sg_length =
sizeof(cmd->sense_buffer)
;
+ scb->sg_length =
SCSI_SENSE_BUFFERSIZE
;
scb->tag_action = 0;
scb->flags |= SCB_SENSE;
/*
scb->tag_action = 0;
scb->flags |= SCB_SENSE;
/*
@@
-6472,7
+6472,7
@@
do_aic7xxx_isr(int irq, void *dev_id)
unsigned long cpu_flags;
struct aic7xxx_host *p;
unsigned long cpu_flags;
struct aic7xxx_host *p;
- p =
(struct aic7xxx_host *)
dev_id;
+ p = dev_id;
if(!p)
return IRQ_NONE;
spin_lock_irqsave(p->host->host_lock, cpu_flags);
if(!p)
return IRQ_NONE;
spin_lock_irqsave(p->host->host_lock, cpu_flags);
@@
-11141,7
+11141,6
@@
static struct scsi_host_template driver_template = {
.max_sectors = 2048,
.cmd_per_lun = 3,
.use_clustering = ENABLE_CLUSTERING,
.max_sectors = 2048,
.cmd_per_lun = 3,
.use_clustering = ENABLE_CLUSTERING,
- .use_sg_chaining = ENABLE_SG_CHAINING,
};
#include "scsi_module.c"
};
#include "scsi_module.c"