diff options
author | Jiri Kosina <jkosina@suse.cz> | 2010-06-17 05:18:31 -0400 |
---|---|---|
committer | Jiri Kosina <jkosina@suse.cz> | 2010-06-17 05:18:31 -0400 |
commit | dcf1b0be1877ae1dc13ea93d4277a6c456cfe9f5 (patch) | |
tree | 2377bc69032aaa1ad97ec6a25cd9704c964fe17e /drivers | |
parent | 638c5945aca0649a9b827a4211683932308f9cc7 (diff) |
trivial: don't touch drivers/staging
This is a partial revert of 421f91d21ad6f ("fix typos concerning "initiali[zs]e"),
as we don't want to touch staging drivers from other trees than staging itself.
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/staging/comedi/drivers/usbdux.c | 2 | ||||
-rw-r--r-- | drivers/staging/octeon/cvmx-cmd-queue.c | 6 | ||||
-rw-r--r-- | drivers/staging/pohmelfs/inode.c | 2 | ||||
-rw-r--r-- | drivers/staging/rt2860/common/cmm_wpa.c | 4 | ||||
-rw-r--r-- | drivers/staging/rtl8192e/r8190_rtl8256.c | 6 |
5 files changed, 10 insertions, 10 deletions
diff --git a/drivers/staging/comedi/drivers/usbdux.c b/drivers/staging/comedi/drivers/usbdux.c index 7b8a2da344b8..27b4cb2e2ec2 100644 --- a/drivers/staging/comedi/drivers/usbdux.c +++ b/drivers/staging/comedi/drivers/usbdux.c | |||
@@ -2085,7 +2085,7 @@ static int usbdux_pwm_start(struct comedi_device *dev, | |||
2085 | if (ret < 0) | 2085 | if (ret < 0) |
2086 | return ret; | 2086 | return ret; |
2087 | 2087 | ||
2088 | /* initialise the buffer */ | 2088 | /* initalise the buffer */ |
2089 | for (i = 0; i < this_usbduxsub->sizePwmBuf; i++) | 2089 | for (i = 0; i < this_usbduxsub->sizePwmBuf; i++) |
2090 | ((char *)(this_usbduxsub->urbPwm->transfer_buffer))[i] = 0; | 2090 | ((char *)(this_usbduxsub->urbPwm->transfer_buffer))[i] = 0; |
2091 | 2091 | ||
diff --git a/drivers/staging/octeon/cvmx-cmd-queue.c b/drivers/staging/octeon/cvmx-cmd-queue.c index e9809d375162..976227b01273 100644 --- a/drivers/staging/octeon/cvmx-cmd-queue.c +++ b/drivers/staging/octeon/cvmx-cmd-queue.c | |||
@@ -140,21 +140,21 @@ cvmx_cmd_queue_result_t cvmx_cmd_queue_initialize(cvmx_cmd_queue_id_t queue_id, | |||
140 | if (qstate->base_ptr_div128) { | 140 | if (qstate->base_ptr_div128) { |
141 | if (max_depth != (int)qstate->max_depth) { | 141 | if (max_depth != (int)qstate->max_depth) { |
142 | cvmx_dprintf("ERROR: cvmx_cmd_queue_initialize: " | 142 | cvmx_dprintf("ERROR: cvmx_cmd_queue_initialize: " |
143 | "Queue already initialized with different " | 143 | "Queue already initalized with different " |
144 | "max_depth (%d).\n", | 144 | "max_depth (%d).\n", |
145 | (int)qstate->max_depth); | 145 | (int)qstate->max_depth); |
146 | return CVMX_CMD_QUEUE_INVALID_PARAM; | 146 | return CVMX_CMD_QUEUE_INVALID_PARAM; |
147 | } | 147 | } |
148 | if (fpa_pool != qstate->fpa_pool) { | 148 | if (fpa_pool != qstate->fpa_pool) { |
149 | cvmx_dprintf("ERROR: cvmx_cmd_queue_initialize: " | 149 | cvmx_dprintf("ERROR: cvmx_cmd_queue_initialize: " |
150 | "Queue already initialized with different " | 150 | "Queue already initalized with different " |
151 | "FPA pool (%u).\n", | 151 | "FPA pool (%u).\n", |
152 | qstate->fpa_pool); | 152 | qstate->fpa_pool); |
153 | return CVMX_CMD_QUEUE_INVALID_PARAM; | 153 | return CVMX_CMD_QUEUE_INVALID_PARAM; |
154 | } | 154 | } |
155 | if ((pool_size >> 3) - 1 != qstate->pool_size_m1) { | 155 | if ((pool_size >> 3) - 1 != qstate->pool_size_m1) { |
156 | cvmx_dprintf("ERROR: cvmx_cmd_queue_initialize: " | 156 | cvmx_dprintf("ERROR: cvmx_cmd_queue_initialize: " |
157 | "Queue already initialized with different " | 157 | "Queue already initalized with different " |
158 | "FPA pool size (%u).\n", | 158 | "FPA pool size (%u).\n", |
159 | (qstate->pool_size_m1 + 1) << 3); | 159 | (qstate->pool_size_m1 + 1) << 3); |
160 | return CVMX_CMD_QUEUE_INVALID_PARAM; | 160 | return CVMX_CMD_QUEUE_INVALID_PARAM; |
diff --git a/drivers/staging/pohmelfs/inode.c b/drivers/staging/pohmelfs/inode.c index e3f95f759757..643b413d9f0f 100644 --- a/drivers/staging/pohmelfs/inode.c +++ b/drivers/staging/pohmelfs/inode.c | |||
@@ -847,7 +847,7 @@ static void pohmelfs_destroy_inode(struct inode *inode) | |||
847 | } | 847 | } |
848 | 848 | ||
849 | /* | 849 | /* |
850 | * ->alloc_inode() callback. Allocates inode and initializes private data. | 850 | * ->alloc_inode() callback. Allocates inode and initilizes private data. |
851 | */ | 851 | */ |
852 | static struct inode *pohmelfs_alloc_inode(struct super_block *sb) | 852 | static struct inode *pohmelfs_alloc_inode(struct super_block *sb) |
853 | { | 853 | { |
diff --git a/drivers/staging/rt2860/common/cmm_wpa.c b/drivers/staging/rt2860/common/cmm_wpa.c index 9414aa344375..c16f3763cca6 100644 --- a/drivers/staging/rt2860/common/cmm_wpa.c +++ b/drivers/staging/rt2860/common/cmm_wpa.c | |||
@@ -427,7 +427,7 @@ void RTMPToWirelessSta(struct rt_rtmp_adapter *pAd, | |||
427 | /* | 427 | /* |
428 | ========================================================================== | 428 | ========================================================================== |
429 | Description: | 429 | Description: |
430 | This is a function to initialize 4-way handshake | 430 | This is a function to initilize 4-way handshake |
431 | 431 | ||
432 | Return: | 432 | Return: |
433 | 433 | ||
@@ -867,7 +867,7 @@ void PeerPairMsg3Action(struct rt_rtmp_adapter *pAd, | |||
867 | ========================================================================== | 867 | ========================================================================== |
868 | Description: | 868 | Description: |
869 | When receiving the last packet of 4-way pairwisekey handshake. | 869 | When receiving the last packet of 4-way pairwisekey handshake. |
870 | Initialize 2-way groupkey handshake following. | 870 | Initilize 2-way groupkey handshake following. |
871 | Return: | 871 | Return: |
872 | ========================================================================== | 872 | ========================================================================== |
873 | */ | 873 | */ |
diff --git a/drivers/staging/rtl8192e/r8190_rtl8256.c b/drivers/staging/rtl8192e/r8190_rtl8256.c index 8bd5b173a7d2..7391f5f8f25f 100644 --- a/drivers/staging/rtl8192e/r8190_rtl8256.c +++ b/drivers/staging/rtl8192e/r8190_rtl8256.c | |||
@@ -501,13 +501,13 @@ SetRFPowerState8190( | |||
501 | if((priv->ieee80211->eRFPowerState == eRfOff) && RT_IN_PS_LEVEL(pPSC, RT_RF_OFF_LEVL_HALT_NIC)) | 501 | if((priv->ieee80211->eRFPowerState == eRfOff) && RT_IN_PS_LEVEL(pPSC, RT_RF_OFF_LEVL_HALT_NIC)) |
502 | { // The current RF state is OFF and the RF OFF level is halting the NIC, re-initialize the NIC. | 502 | { // The current RF state is OFF and the RF OFF level is halting the NIC, re-initialize the NIC. |
503 | bool rtstatus = true; | 503 | bool rtstatus = true; |
504 | u32 InitializeCount = 3; | 504 | u32 InitilizeCount = 3; |
505 | do | 505 | do |
506 | { | 506 | { |
507 | InitializeCount--; | 507 | InitilizeCount--; |
508 | priv->RegRfOff = false; | 508 | priv->RegRfOff = false; |
509 | rtstatus = NicIFEnableNIC(dev); | 509 | rtstatus = NicIFEnableNIC(dev); |
510 | }while( (rtstatus != true) &&(InitializeCount >0) ); | 510 | }while( (rtstatus != true) &&(InitilizeCount >0) ); |
511 | 511 | ||
512 | if(rtstatus != true) | 512 | if(rtstatus != true) |
513 | { | 513 | { |