aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/message
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2010-08-04 18:31:02 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2010-08-04 18:31:02 -0400
commit3cfc2c42c1cbc8e238bb9c0612c0df4565e3a8b4 (patch)
tree5adc1ff2eaf64d450bf28bb6b2ce890db2567288 /drivers/message
parent5cf65713f87775c548e3eb48dbafa32e12f28000 (diff)
parent0ea6e61122196509af82cc4f36cbdaacbefb8227 (diff)
Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
* 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (48 commits) Documentation: update broken web addresses. fix comment typo "choosed" -> "chosen" hostap:hostap_hw.c Fix typo in comment Fix spelling contorller -> controller in comments Kconfig.debug: FAIL_IO_TIMEOUT: typo Faul -> Fault fs/Kconfig: Fix typo Userpace -> Userspace Removing dead MACH_U300_BS26 drivers/infiniband: Remove unnecessary casts of private_data fs/ocfs2: Remove unnecessary casts of private_data libfc: use ARRAY_SIZE scsi: bfa: use ARRAY_SIZE drm: i915: use ARRAY_SIZE drm: drm_edid: use ARRAY_SIZE synclink: use ARRAY_SIZE block: cciss: use ARRAY_SIZE comment typo fixes: charater => character fix comment typos concerning "challenge" arm: plat-spear: fix typo in kerneldoc reiserfs: typo comment fix update email address ...
Diffstat (limited to 'drivers/message')
-rw-r--r--drivers/message/fusion/mptbase.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/message/fusion/mptbase.c b/drivers/message/fusion/mptbase.c
index 2a52559058a9..b88a244a1edd 100644
--- a/drivers/message/fusion/mptbase.c
+++ b/drivers/message/fusion/mptbase.c
@@ -1799,7 +1799,7 @@ mpt_attach(struct pci_dev *pdev, const struct pci_device_id *id)
1799 ioc->sh = NULL; 1799 ioc->sh = NULL;
1800 ioc->cached_fw = NULL; 1800 ioc->cached_fw = NULL;
1801 1801
1802 /* Initilize SCSI Config Data structure 1802 /* Initialize SCSI Config Data structure
1803 */ 1803 */
1804 memset(&ioc->spi_data, 0, sizeof(SpiCfgData)); 1804 memset(&ioc->spi_data, 0, sizeof(SpiCfgData));
1805 1805
@@ -2478,7 +2478,7 @@ mpt_do_ioc_recovery(MPT_ADAPTER *ioc, u32 reason, int sleepFlag)
2478 if ((ret == 0) && (reason == MPT_HOSTEVENT_IOC_BRINGUP)) { 2478 if ((ret == 0) && (reason == MPT_HOSTEVENT_IOC_BRINGUP)) {
2479 2479
2480 /* 2480 /*
2481 * Initalize link list for inactive raid volumes. 2481 * Initialize link list for inactive raid volumes.
2482 */ 2482 */
2483 mutex_init(&ioc->raid_data.inactive_list_mutex); 2483 mutex_init(&ioc->raid_data.inactive_list_mutex);
2484 INIT_LIST_HEAD(&ioc->raid_data.inactive_list); 2484 INIT_LIST_HEAD(&ioc->raid_data.inactive_list);