diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-02-04 10:58:52 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-02-04 10:58:52 -0500 |
| commit | f5bb3a5e9dcdb8435471562b6cada89525cf4df1 (patch) | |
| tree | 7b7cf9b90bacd0e2fe07cb3387516e9243f1ab66 /drivers/block | |
| parent | 9853832c49dc1685587abeb4e1decd4be690d256 (diff) | |
| parent | 1560a79a2c2ea0c3826150da8029991d685de990 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial
* git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial: (79 commits)
Jesper Juhl is the new trivial patches maintainer
Documentation: mention email-clients.txt in SubmittingPatches
fs/binfmt_elf.c: spello fix
do_invalidatepage() comment typo fix
Documentation/filesystems/porting fixes
typo fixes in net/core/net_namespace.c
typo fix in net/rfkill/rfkill.c
typo fixes in net/sctp/sm_statefuns.c
lib/: Spelling fixes
kernel/: Spelling fixes
include/scsi/: Spelling fixes
include/linux/: Spelling fixes
include/asm-m68knommu/: Spelling fixes
include/asm-frv/: Spelling fixes
fs/: Spelling fixes
drivers/watchdog/: Spelling fixes
drivers/video/: Spelling fixes
drivers/ssb/: Spelling fixes
drivers/serial/: Spelling fixes
drivers/scsi/: Spelling fixes
...
Diffstat (limited to 'drivers/block')
| -rw-r--r-- | drivers/block/cciss_scsi.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/block/cciss_scsi.c b/drivers/block/cciss_scsi.c index 63ee6c076cb3..55178e9973a0 100644 --- a/drivers/block/cciss_scsi.c +++ b/drivers/block/cciss_scsi.c | |||
| @@ -1453,7 +1453,7 @@ static int cciss_eh_device_reset_handler(struct scsi_cmnd *scsicmd) | |||
| 1453 | rc = sendcmd(CCISS_RESET_MSG, ctlr, NULL, 0, 2, 0, 0, | 1453 | rc = sendcmd(CCISS_RESET_MSG, ctlr, NULL, 0, 2, 0, 0, |
| 1454 | (unsigned char *) &cmd_in_trouble->Header.LUN.LunAddrBytes[0], | 1454 | (unsigned char *) &cmd_in_trouble->Header.LUN.LunAddrBytes[0], |
| 1455 | TYPE_MSG); | 1455 | TYPE_MSG); |
| 1456 | /* sendcmd turned off interrputs on the board, turn 'em back on. */ | 1456 | /* sendcmd turned off interrupts on the board, turn 'em back on. */ |
| 1457 | (*c)->access.set_intr_mask(*c, CCISS_INTR_ON); | 1457 | (*c)->access.set_intr_mask(*c, CCISS_INTR_ON); |
| 1458 | if (rc == 0) | 1458 | if (rc == 0) |
| 1459 | return SUCCESS; | 1459 | return SUCCESS; |
| @@ -1483,7 +1483,7 @@ static int cciss_eh_abort_handler(struct scsi_cmnd *scsicmd) | |||
| 1483 | 0, 2, 0, 0, | 1483 | 0, 2, 0, 0, |
| 1484 | (unsigned char *) &cmd_to_abort->Header.LUN.LunAddrBytes[0], | 1484 | (unsigned char *) &cmd_to_abort->Header.LUN.LunAddrBytes[0], |
| 1485 | TYPE_MSG); | 1485 | TYPE_MSG); |
| 1486 | /* sendcmd turned off interrputs on the board, turn 'em back on. */ | 1486 | /* sendcmd turned off interrupts on the board, turn 'em back on. */ |
| 1487 | (*c)->access.set_intr_mask(*c, CCISS_INTR_ON); | 1487 | (*c)->access.set_intr_mask(*c, CCISS_INTR_ON); |
| 1488 | if (rc == 0) | 1488 | if (rc == 0) |
| 1489 | return SUCCESS; | 1489 | return SUCCESS; |