diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-12-09 22:43:33 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-12-09 22:43:33 -0500 |
commit | 4ef58d4e2ad1fa2a3e5bbf41af2284671fca8cf8 (patch) | |
tree | 856ba96302a36014736747e8464f80eeb827bbdd /drivers/scsi/aic7xxx/aic79xx.seq | |
parent | f6c4c8195b5e7878823caa1181be404d9e86d369 (diff) | |
parent | d014d043869cdc591f3a33243d3481fa4479c2d0 (diff) |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (42 commits)
tree-wide: fix misspelling of "definition" in comments
reiserfs: fix misspelling of "journaled"
doc: Fix a typo in slub.txt.
inotify: remove superfluous return code check
hdlc: spelling fix in find_pvc() comment
doc: fix regulator docs cut-and-pasteism
mtd: Fix comment in Kconfig
doc: Fix IRQ chip docs
tree-wide: fix assorted typos all over the place
drivers/ata/libata-sff.c: comment spelling fixes
fix typos/grammos in Documentation/edac.txt
sysctl: add missing comments
fs/debugfs/inode.c: fix comment typos
sgivwfb: Make use of ARRAY_SIZE.
sky2: fix sky2_link_down copy/paste comment error
tree-wide: fix typos "couter" -> "counter"
tree-wide: fix typos "offest" -> "offset"
fix kerneldoc for set_irq_msi()
spidev: fix double "of of" in comment
comment typo fix: sybsystem -> subsystem
...
Diffstat (limited to 'drivers/scsi/aic7xxx/aic79xx.seq')
-rw-r--r-- | drivers/scsi/aic7xxx/aic79xx.seq | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/scsi/aic7xxx/aic79xx.seq b/drivers/scsi/aic7xxx/aic79xx.seq index 58bc17591b54..2fb78e35a9e5 100644 --- a/drivers/scsi/aic7xxx/aic79xx.seq +++ b/drivers/scsi/aic7xxx/aic79xx.seq | |||
@@ -217,7 +217,7 @@ BEGIN_CRITICAL; | |||
217 | scbdma_tohost_done: | 217 | scbdma_tohost_done: |
218 | test CCSCBCTL, CCARREN jz fill_qoutfifo_dmadone; | 218 | test CCSCBCTL, CCARREN jz fill_qoutfifo_dmadone; |
219 | /* | 219 | /* |
220 | * An SCB has been succesfully uploaded to the host. | 220 | * An SCB has been successfully uploaded to the host. |
221 | * If the SCB was uploaded for some reason other than | 221 | * If the SCB was uploaded for some reason other than |
222 | * bad SCSI status (currently only for underruns), we | 222 | * bad SCSI status (currently only for underruns), we |
223 | * queue the SCB for normal completion. Otherwise, we | 223 | * queue the SCB for normal completion. Otherwise, we |
@@ -1281,7 +1281,7 @@ END_CRITICAL; | |||
1281 | * Is it a disconnect message? Set a flag in the SCB to remind us | 1281 | * Is it a disconnect message? Set a flag in the SCB to remind us |
1282 | * and await the bus going free. If this is an untagged transaction | 1282 | * and await the bus going free. If this is an untagged transaction |
1283 | * store the SCB id for it in our untagged target table for lookup on | 1283 | * store the SCB id for it in our untagged target table for lookup on |
1284 | * a reselction. | 1284 | * a reselection. |
1285 | */ | 1285 | */ |
1286 | mesgin_disconnect: | 1286 | mesgin_disconnect: |
1287 | /* | 1287 | /* |