Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 364200
b: refs/heads/master
c: ad5774f
h: refs/heads/master
v: v3
  • Loading branch information
H Hartley Sweeten authored and Greg Kroah-Hartman committed Apr 23, 2013
1 parent 1b2b42d commit 4d8f06f
Show file tree
Hide file tree
Showing 2 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: 7f340859f26e6de7069d0c4f234d948820c4fd47
refs/heads/master: ad5774fcd2cd40dd8a0f3d9db9b0a3538d47e610
10 changes: 5 additions & 5 deletions trunk/drivers/staging/comedi/drivers/das800.c
Original file line number Diff line number Diff line change
Expand Up @@ -228,10 +228,10 @@ static const struct das800_board das800_boards[] = {

struct das800_private {
unsigned int count; /* number of data points left to be taken */
int forever; /* flag that we should take data forever */
unsigned int divisor1; /* counter 1 value for timed conversions */
unsigned int divisor2; /* counter 2 value for timed conversions */
int do_bits; /* digital output bits */
unsigned int do_bits; /* digital output bits */
bool forever; /* flag that we should take data forever */
};

static void das800_ind_write(struct comedi_device *dev,
Expand Down Expand Up @@ -301,7 +301,7 @@ static int das800_cancel(struct comedi_device *dev, struct comedi_subdevice *s)
{
struct das800_private *devpriv = dev->private;

devpriv->forever = 0;
devpriv->forever = false;
devpriv->count = 0;
das800_disable(dev);
return 0;
Expand Down Expand Up @@ -434,10 +434,10 @@ static int das800_ai_do_cmd(struct comedi_device *dev,
switch (async->cmd.stop_src) {
case TRIG_COUNT:
devpriv->count = async->cmd.stop_arg * async->cmd.chanlist_len;
devpriv->forever = 0;
devpriv->forever = false;
break;
case TRIG_NONE:
devpriv->forever = 1;
devpriv->forever = true;
devpriv->count = 0;
break;
default:
Expand Down

0 comments on commit 4d8f06f

Please sign in to comment.