diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-03-21 00:12:50 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-03-21 00:12:50 -0400 |
commit | 69a7aebcf019ab3ff5764525ad6858fbe23bb86d (patch) | |
tree | 7211df5704b743a7667159748c670a9744164482 /drivers/scsi/qla4xxx | |
parent | d464c92b5234227c1698862a1906827e2e398ae0 (diff) | |
parent | f1f996b66cc3908a8f5ffccc2ff41840e92f3b10 (diff) |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
Pull trivial tree from Jiri Kosina:
"It's indeed trivial -- mostly documentation updates and a bunch of
typo fixes from Masanari.
There are also several linux/version.h include removals from Jesper."
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (101 commits)
kcore: fix spelling in read_kcore() comment
constify struct pci_dev * in obvious cases
Revert "char: Fix typo in viotape.c"
init: fix wording error in mm_init comment
usb: gadget: Kconfig: fix typo for 'different'
Revert "power, max8998: Include linux/module.h just once in drivers/power/max8998_charger.c"
writeback: fix fn name in writeback_inodes_sb_nr_if_idle() comment header
writeback: fix typo in the writeback_control comment
Documentation: Fix multiple typo in Documentation
tpm_tis: fix tis_lock with respect to RCU
Revert "media: Fix typo in mixer_drv.c and hdmi_drv.c"
Doc: Update numastat.txt
qla4xxx: Add missing spaces to error messages
compiler.h: Fix typo
security: struct security_operations kerneldoc fix
Documentation: broken URL in libata.tmpl
Documentation: broken URL in filesystems.tmpl
mtd: simplify return logic in do_map_probe()
mm: fix comment typo of truncate_inode_pages_range
power: bq27x00: Fix typos in comment
...
Diffstat (limited to 'drivers/scsi/qla4xxx')
-rw-r--r-- | drivers/scsi/qla4xxx/ql4_os.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/scsi/qla4xxx/ql4_os.c b/drivers/scsi/qla4xxx/ql4_os.c index ce6d3b7f0c61..edf503437e96 100644 --- a/drivers/scsi/qla4xxx/ql4_os.c +++ b/drivers/scsi/qla4xxx/ql4_os.c | |||
@@ -3382,7 +3382,7 @@ static int get_fw_boot_info(struct scsi_qla_host *ha, uint16_t ddb_index[]) | |||
3382 | if (qla4xxx_get_flash(ha, buf_dma, addr, | 3382 | if (qla4xxx_get_flash(ha, buf_dma, addr, |
3383 | 13 * sizeof(uint8_t)) != QLA_SUCCESS) { | 3383 | 13 * sizeof(uint8_t)) != QLA_SUCCESS) { |
3384 | DEBUG2(ql4_printk(KERN_ERR, ha, "scsi%ld: %s: Get Flash" | 3384 | DEBUG2(ql4_printk(KERN_ERR, ha, "scsi%ld: %s: Get Flash" |
3385 | "failed\n", ha->host_no, __func__)); | 3385 | " failed\n", ha->host_no, __func__)); |
3386 | ret = QLA_ERROR; | 3386 | ret = QLA_ERROR; |
3387 | goto exit_boot_info_free; | 3387 | goto exit_boot_info_free; |
3388 | } | 3388 | } |
@@ -3620,7 +3620,7 @@ static int qla4xxx_setup_boot_info(struct scsi_qla_host *ha) | |||
3620 | 3620 | ||
3621 | if (ql4xdisablesysfsboot) { | 3621 | if (ql4xdisablesysfsboot) { |
3622 | ql4_printk(KERN_INFO, ha, | 3622 | ql4_printk(KERN_INFO, ha, |
3623 | "%s: syfsboot disabled - driver will trigger login" | 3623 | "%s: syfsboot disabled - driver will trigger login " |
3624 | "and publish session for discovery .\n", __func__); | 3624 | "and publish session for discovery .\n", __func__); |
3625 | return QLA_SUCCESS; | 3625 | return QLA_SUCCESS; |
3626 | } | 3626 | } |