Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 363687
b: refs/heads/master
c: add873f
h: refs/heads/master
i:
  363685: bd45b18
  363683: f6fbb78
  363679: 5466673
v: v3
  • Loading branch information
Ian Abbott authored and Greg Kroah-Hartman committed Mar 25, 2013
1 parent 6df64b4 commit c194a87
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 8 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: f7282f05e1cb39556b5e29d113803e934f3e6d3e
refs/heads/master: add873f29c6ed2c797208b861a99d992172b9495
14 changes: 7 additions & 7 deletions trunk/drivers/staging/comedi/drivers/amplc_dio200.c
Original file line number Diff line number Diff line change
Expand Up @@ -581,13 +581,13 @@ struct dio200_subdev_8255 {
};

struct dio200_subdev_intr {
unsigned int ofs;
spinlock_t spinlock;
int active;
unsigned int ofs;
unsigned int valid_isns;
unsigned int enabled_isns;
unsigned int stopcount;
int continuous;
bool active:1;
bool continuous:1;
};

static inline const struct dio200_layout *
Expand Down Expand Up @@ -723,7 +723,7 @@ static void dio200_stop_intr(struct comedi_device *dev,
const struct dio200_layout *layout = dio200_dev_layout(dev);
struct dio200_subdev_intr *subpriv = s->private;

subpriv->active = 0;
subpriv->active = false;
subpriv->enabled_isns = 0;
if (layout->has_int_sce)
dio200_write8(dev, subpriv->ofs, 0);
Expand All @@ -745,7 +745,7 @@ static int dio200_start_intr(struct comedi_device *dev,
if (!subpriv->continuous && subpriv->stopcount == 0) {
/* An empty acquisition! */
s->async->events |= COMEDI_CB_EOA;
subpriv->active = 0;
subpriv->active = false;
retval = 1;
} else {
/* Determine interrupt sources to enable. */
Expand Down Expand Up @@ -998,12 +998,12 @@ static int dio200_subdev_intr_cmd(struct comedi_device *dev,
/* Set up end of acquisition. */
switch (cmd->stop_src) {
case TRIG_COUNT:
subpriv->continuous = 0;
subpriv->continuous = false;
subpriv->stopcount = cmd->stop_arg;
break;
default:
/* TRIG_NONE */
subpriv->continuous = 1;
subpriv->continuous = true;
subpriv->stopcount = 0;
break;
}
Expand Down

0 comments on commit c194a87

Please sign in to comment.