diff options
| author | James Bottomley <jejb@titanic.(none)> | 2005-11-04 23:29:52 -0500 |
|---|---|---|
| committer | James Bottomley <jejb@titanic.(none)> | 2005-11-04 23:29:52 -0500 |
| commit | 849a8924a6740ecbf9711e015beca69425f0c429 (patch) | |
| tree | 2bae44c5fb170a655696b7253eec7ee13c6fa437 /drivers/scsi/sym53c416.c | |
| parent | 7015faa7df829876a0f931cd18aa6d7c24a1b581 (diff) | |
| parent | ee807c2d43b54183c16580857837dae8ccb2ed22 (diff) | |
Merge by Hand
Conflicts in dec_esp.c (Thanks Bacchus), scsi_transport_iscsi.c and
scsi_transport_fc.h
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
Diffstat (limited to 'drivers/scsi/sym53c416.c')
| -rw-r--r-- | drivers/scsi/sym53c416.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/scsi/sym53c416.c b/drivers/scsi/sym53c416.c index ef19adc67eff..93dc7b665ccf 100644 --- a/drivers/scsi/sym53c416.c +++ b/drivers/scsi/sym53c416.c | |||
| @@ -773,7 +773,7 @@ int sym53c416_queuecommand(Scsi_Cmnd *SCpnt, void (*done)(Scsi_Cmnd *)) | |||
| 773 | current_command->SCp.Message = 0; | 773 | current_command->SCp.Message = 0; |
| 774 | 774 | ||
| 775 | spin_lock_irqsave(&sym53c416_lock, flags); | 775 | spin_lock_irqsave(&sym53c416_lock, flags); |
| 776 | outb(SCpnt->device->id, base + DEST_BUS_ID); /* Set scsi id target */ | 776 | outb(scmd_id(SCpnt), base + DEST_BUS_ID); /* Set scsi id target */ |
| 777 | outb(FLUSH_FIFO, base + COMMAND_REG); /* Flush SCSI and PIO FIFO's */ | 777 | outb(FLUSH_FIFO, base + COMMAND_REG); /* Flush SCSI and PIO FIFO's */ |
| 778 | /* Write SCSI command into the SCSI fifo */ | 778 | /* Write SCSI command into the SCSI fifo */ |
| 779 | for(i = 0; i < SCpnt->cmd_len; i++) | 779 | for(i = 0; i < SCpnt->cmd_len; i++) |