diff options
Diffstat (limited to 'drivers/scsi/aic7xxx_old.c')
-rw-r--r-- | drivers/scsi/aic7xxx_old.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/drivers/scsi/aic7xxx_old.c b/drivers/scsi/aic7xxx_old.c index 8f8db5f0aef7..bcb0b870320c 100644 --- 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) | |||
2696 | { | 2696 | { |
2697 | pci_unmap_single(p->pdev, | 2697 | pci_unmap_single(p->pdev, |
2698 | le32_to_cpu(scb->sg_list[0].address), | 2698 | le32_to_cpu(scb->sg_list[0].address), |
2699 | sizeof(cmd->sense_buffer), | 2699 | SCSI_SENSE_BUFFERSIZE, |
2700 | PCI_DMA_FROMDEVICE); | 2700 | PCI_DMA_FROMDEVICE); |
2701 | } | 2701 | } |
2702 | if (scb->flags & SCB_RECOVERY_SCB) | 2702 | if (scb->flags & SCB_RECOVERY_SCB) |
@@ -4267,13 +4267,13 @@ aic7xxx_handle_seqint(struct aic7xxx_host *p, unsigned char intstat) | |||
4267 | sizeof(generic_sense)); | 4267 | sizeof(generic_sense)); |
4268 | 4268 | ||
4269 | scb->sense_cmd[1] = (cmd->device->lun << 5); | 4269 | scb->sense_cmd[1] = (cmd->device->lun << 5); |
4270 | scb->sense_cmd[4] = sizeof(cmd->sense_buffer); | 4270 | scb->sense_cmd[4] = SCSI_SENSE_BUFFERSIZE; |
4271 | 4271 | ||
4272 | scb->sg_list[0].length = | 4272 | scb->sg_list[0].length = |
4273 | cpu_to_le32(sizeof(cmd->sense_buffer)); | 4273 | cpu_to_le32(SCSI_SENSE_BUFFERSIZE); |
4274 | scb->sg_list[0].address = | 4274 | scb->sg_list[0].address = |
4275 | cpu_to_le32(pci_map_single(p->pdev, cmd->sense_buffer, | 4275 | cpu_to_le32(pci_map_single(p->pdev, cmd->sense_buffer, |
4276 | sizeof(cmd->sense_buffer), | 4276 | SCSI_SENSE_BUFFERSIZE, |
4277 | PCI_DMA_FROMDEVICE)); | 4277 | PCI_DMA_FROMDEVICE)); |
4278 | 4278 | ||
4279 | /* | 4279 | /* |
@@ -4296,7 +4296,7 @@ aic7xxx_handle_seqint(struct aic7xxx_host *p, unsigned char intstat) | |||
4296 | hscb->residual_data_count[2] = 0; | 4296 | hscb->residual_data_count[2] = 0; |
4297 | 4297 | ||
4298 | scb->sg_count = hscb->SG_segment_count = 1; | 4298 | scb->sg_count = hscb->SG_segment_count = 1; |
4299 | scb->sg_length = sizeof(cmd->sense_buffer); | 4299 | scb->sg_length = SCSI_SENSE_BUFFERSIZE; |
4300 | scb->tag_action = 0; | 4300 | scb->tag_action = 0; |
4301 | scb->flags |= SCB_SENSE; | 4301 | scb->flags |= SCB_SENSE; |
4302 | /* | 4302 | /* |
@@ -10293,7 +10293,6 @@ static int aic7xxx_queue(struct scsi_cmnd *cmd, void (*fn)(struct scsi_cmnd *)) | |||
10293 | aic7xxx_position(cmd) = scb->hscb->tag; | 10293 | aic7xxx_position(cmd) = scb->hscb->tag; |
10294 | cmd->scsi_done = fn; | 10294 | cmd->scsi_done = fn; |
10295 | cmd->result = DID_OK; | 10295 | cmd->result = DID_OK; |
10296 | memset(cmd->sense_buffer, 0, sizeof(cmd->sense_buffer)); | ||
10297 | aic7xxx_error(cmd) = DID_OK; | 10296 | aic7xxx_error(cmd) = DID_OK; |
10298 | aic7xxx_status(cmd) = 0; | 10297 | aic7xxx_status(cmd) = 0; |
10299 | cmd->host_scribble = NULL; | 10298 | cmd->host_scribble = NULL; |