Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 205713
b: refs/heads/master
c: 37523e8
h: refs/heads/master
i:
  205711: 13421aa
v: v3
  • Loading branch information
Uwe Kleine-König authored and Greg Kroah-Hartman committed Jun 22, 2010
1 parent c1afc9f commit 76b9b16
Show file tree
Hide file tree
Showing 6 changed files with 11 additions and 11 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 429ccf058bc201734a9a77b4126ee64930bad19b
refs/heads/master: 37523e84cbf1d82fcc8237ed10818d37b951144e
2 changes: 1 addition & 1 deletion trunk/drivers/staging/comedi/drivers/usbdux.c
Original file line number Diff line number Diff line change
Expand Up @@ -2085,7 +2085,7 @@ static int usbdux_pwm_start(struct comedi_device *dev,
if (ret < 0)
return ret;

/* initalise the buffer */
/* initialise the buffer */
for (i = 0; i < this_usbduxsub->sizePwmBuf; i++)
((char *)(this_usbduxsub->urbPwm->transfer_buffer))[i] = 0;

Expand Down
6 changes: 3 additions & 3 deletions trunk/drivers/staging/octeon/cvmx-cmd-queue.c
Original file line number Diff line number Diff line change
Expand Up @@ -140,21 +140,21 @@ cvmx_cmd_queue_result_t cvmx_cmd_queue_initialize(cvmx_cmd_queue_id_t queue_id,
if (qstate->base_ptr_div128) {
if (max_depth != (int)qstate->max_depth) {
cvmx_dprintf("ERROR: cvmx_cmd_queue_initialize: "
"Queue already initalized with different "
"Queue already initialized with different "
"max_depth (%d).\n",
(int)qstate->max_depth);
return CVMX_CMD_QUEUE_INVALID_PARAM;
}
if (fpa_pool != qstate->fpa_pool) {
cvmx_dprintf("ERROR: cvmx_cmd_queue_initialize: "
"Queue already initalized with different "
"Queue already initialized with different "
"FPA pool (%u).\n",
qstate->fpa_pool);
return CVMX_CMD_QUEUE_INVALID_PARAM;
}
if ((pool_size >> 3) - 1 != qstate->pool_size_m1) {
cvmx_dprintf("ERROR: cvmx_cmd_queue_initialize: "
"Queue already initalized with different "
"Queue already initialized with different "
"FPA pool size (%u).\n",
(qstate->pool_size_m1 + 1) << 3);
return CVMX_CMD_QUEUE_INVALID_PARAM;
Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/staging/pohmelfs/inode.c
Original file line number Diff line number Diff line change
Expand Up @@ -847,7 +847,7 @@ static void pohmelfs_destroy_inode(struct inode *inode)
}

/*
* ->alloc_inode() callback. Allocates inode and initilizes private data.
* ->alloc_inode() callback. Allocates inode and initializes private data.
*/
static struct inode *pohmelfs_alloc_inode(struct super_block *sb)
{
Expand Down
4 changes: 2 additions & 2 deletions trunk/drivers/staging/rt2860/common/cmm_wpa.c
Original file line number Diff line number Diff line change
Expand Up @@ -427,7 +427,7 @@ void RTMPToWirelessSta(struct rt_rtmp_adapter *pAd,
/*
==========================================================================
Description:
This is a function to initilize 4-way handshake
This is a function to initialize 4-way handshake
Return:
Expand Down Expand Up @@ -867,7 +867,7 @@ void PeerPairMsg3Action(struct rt_rtmp_adapter *pAd,
==========================================================================
Description:
When receiving the last packet of 4-way pairwisekey handshake.
Initilize 2-way groupkey handshake following.
Initialize 2-way groupkey handshake following.
Return:
==========================================================================
*/
Expand Down
6 changes: 3 additions & 3 deletions trunk/drivers/staging/rtl8192e/r8190_rtl8256.c
Original file line number Diff line number Diff line change
Expand Up @@ -501,13 +501,13 @@ SetRFPowerState8190(
if((priv->ieee80211->eRFPowerState == eRfOff) && RT_IN_PS_LEVEL(pPSC, RT_RF_OFF_LEVL_HALT_NIC))
{ // The current RF state is OFF and the RF OFF level is halting the NIC, re-initialize the NIC.
bool rtstatus = true;
u32 InitilizeCount = 3;
u32 InitializeCount = 3;
do
{
InitilizeCount--;
InitializeCount--;
priv->RegRfOff = false;
rtstatus = NicIFEnableNIC(dev);
}while( (rtstatus != true) &&(InitilizeCount >0) );
}while( (rtstatus != true) &&(InitializeCount >0) );

if(rtstatus != true)
{
Expand Down

0 comments on commit 76b9b16

Please sign in to comment.