Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 268545
b: refs/heads/master
c: 589cabe
h: refs/heads/master
i:
  268543: 2a4319e
v: v3
  • Loading branch information
Christopher Rice authored and Greg Kroah-Hartman committed Sep 27, 2011
1 parent c93a548 commit 6fb2252
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 3 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: bcd9a1e91fbc293bbbbddd98df687ad2e8027c89
refs/heads/master: 589cabe1b13576b85419d73ba87e50f7f80463fb
5 changes: 3 additions & 2 deletions trunk/drivers/staging/comedi/drivers/cb_das16_cs.c
Original file line number Diff line number Diff line change
Expand Up @@ -370,7 +370,8 @@ static int das16cs_ai_cmdtest(struct comedi_device *dev,
if (err)
return 1;

/* step 2: make sure trigger sources are unique and mutually compatible */
/* step 2: make sure trigger sources are unique and
* mutually compatible */

/* note that mutual compatibility is not an issue here */
if (cmd->scan_begin_src != TRIG_TIMER &&
Expand Down Expand Up @@ -508,7 +509,7 @@ static int das16cs_ao_winsn(struct comedi_device *dev,
else
status1 |= 0x0008;

/* printk("0x%04x\n",status1);*/
/* printk("0x%04x\n",status1);*/
outw(status1, dev->iobase + 4);
udelay(1);

Expand Down

0 comments on commit 6fb2252

Please sign in to comment.