Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 325439
b: refs/heads/master
c: bff6c3e
h: refs/heads/master
i:
  325437: ee0caa3
  325435: 9310683
  325431: 9dda8b0
  325423: 7dbc663
  325407: 4808c63
  325375: eaca102
v: v3
  • Loading branch information
Adam Buchbinder authored and Greg Kroah-Hartman committed Sep 21, 2012
1 parent f6490b9 commit 60d2a53
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 6 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: f2635894e8e786d7c93a21f24efb690981d15842
refs/heads/master: bff6c3e00ca7e56ca82e19ffb722159cf1216d20
2 changes: 1 addition & 1 deletion trunk/drivers/staging/comedi/drivers/rtd520.c
Original file line number Diff line number Diff line change
Expand Up @@ -964,7 +964,7 @@ static int rtd_ai_poll(struct comedi_device *dev, struct comedi_subdevice *s)
/*
cmdtest tests a particular command to see if it is valid.
Using the cmdtest ioctl, a user can create a valid cmd
and then have it executed by the cmd ioctl (asyncronously).
and then have it executed by the cmd ioctl (asynchronously).
cmdtest returns 1,2,3,4 or 0, depending on which tests
the command passes.
Expand Down
4 changes: 2 additions & 2 deletions trunk/drivers/staging/csr/sme_blocking.c
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,10 @@


/*
* This file also contains the implementation of the asyncronous
* This file also contains the implementation of the asynchronous
* requests to the SME.
*
* Before calling an asyncronous SME function, we call sme_init_request()
* Before calling an asynchronous SME function, we call sme_init_request()
* which gets hold of the SME semaphore and updates the request status.
* The semaphore makes sure that there is only one pending request to
* the SME at a time.
Expand Down
4 changes: 2 additions & 2 deletions trunk/drivers/staging/telephony/ixj.c
Original file line number Diff line number Diff line change
Expand Up @@ -7057,7 +7057,7 @@ static int ixj_selfprobe(IXJ *j)
printk(KERN_INFO "Enable Line Monitor\n");

if (ixjdebug & 0x0002)
printk(KERN_INFO "Set Line Monitor to Asyncronous Mode\n");
printk(KERN_INFO "Set Line Monitor to Asynchronous Mode\n");

if (ixj_WriteDSPCommand(0x7E01, j)) /* Asynchronous Line Monitor */
return -1;
Expand All @@ -7068,7 +7068,7 @@ static int ixj_selfprobe(IXJ *j)
if (ixj_WriteDSPCommand(0x5151, j)) /* Enable DTMF detection */
return -1;

if (ixj_WriteDSPCommand(0x6E01, j)) /* Set Asyncronous Tone Generation */
if (ixj_WriteDSPCommand(0x6E01, j)) /* Set Asynchronous Tone Generation */
return -1;

set_rec_depth(j, 2); /* Set Record Channel Limit to 2 frames */
Expand Down

0 comments on commit 60d2a53

Please sign in to comment.