diff options
author | H. Peter Anvin <hpa@zytor.com> | 2009-12-11 10:57:42 -0800 |
---|---|---|
committer | H. Peter Anvin <hpa@zytor.com> | 2009-12-11 10:57:42 -0800 |
commit | 5c6baba84e1ac6a79b266b40e17e692aab6604a1 (patch) | |
tree | 6ba34db1109107023d753dd9fd5c359b3b990a04 /drivers/scsi/dc395x.c | |
parent | 893f38d144a4d96d2483cd7c3801d26e1b2c23e9 (diff) | |
parent | 3ef884b4c04e857c283cc77ca70ad8f638d94b0e (diff) |
Merge commit 'linus/master' into x86/urgent
Diffstat (limited to 'drivers/scsi/dc395x.c')
-rw-r--r-- | drivers/scsi/dc395x.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/scsi/dc395x.c b/drivers/scsi/dc395x.c index 075e2397273..6c59c02c1ed 100644 --- a/drivers/scsi/dc395x.c +++ b/drivers/scsi/dc395x.c @@ -1509,7 +1509,7 @@ static u8 start_scsi(struct AdapterCtlBlk* acb, struct DeviceCtlBlk* dcb, * Try anyway? * * We could, BUT: Sometimes the TRM_S1040 misses to produce a Selection - * Timeout, a Disconnect or a Reselction IRQ, so we would be screwed! + * Timeout, a Disconnect or a Reselection IRQ, so we would be screwed! * (This is likely to be a bug in the hardware. Obviously, most people * only have one initiator per SCSI bus.) * Instead let this fail and have the timer make sure the command is |