Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 141660
b: refs/heads/master
c: 8e7b864
h: refs/heads/master
v: v3
  • Loading branch information
Bill Pemberton authored and Greg Kroah-Hartman committed Apr 3, 2009
1 parent 357112b commit 2178bf9
Show file tree
Hide file tree
Showing 2 changed files with 9 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: 050509fa558306399f2a987956514a8f849846ef
refs/heads/master: 8e7b864b3c8357dd8318ade3970cd3b5fe0571e0
15 changes: 8 additions & 7 deletions trunk/drivers/staging/comedi/drivers/pcm3724.c
Original file line number Diff line number Diff line change
Expand Up @@ -74,10 +74,11 @@ typedef struct {
} boardtype;

//used to track configured dios
typedef struct {
struct priv_pcm3724 {
int dio_1;
int dio_2;
} priv_pcm3724;
};

static const boardtype boardtypes[] = {
{"pcm3724", 48, 2, 0x00fc, PCM3724_SIZE,},
};
Expand Down Expand Up @@ -180,10 +181,10 @@ static void enable_chan(struct comedi_device * dev, struct comedi_subdevice * s,
{
unsigned int mask;
int gatecfg;
priv_pcm3724 *priv;
struct priv_pcm3724 *priv;

gatecfg = 0;
priv = (priv_pcm3724 *) (dev->private);
priv = (struct priv_pcm3724 *) (dev->private);

mask = 1 << CR_CHAN(chanspec);
if (s == dev->subdevices) { // subdev 0
Expand Down Expand Up @@ -259,11 +260,11 @@ static int pcm3724_attach(struct comedi_device * dev, struct comedi_devconfig *

iobase = it->options[0];
iorange = this_board->io_range;
if ((ret = alloc_private(dev, sizeof(priv_pcm3724))) < 0)
if ((ret = alloc_private(dev, sizeof(struct priv_pcm3724))) < 0)
return -ENOMEM;

((priv_pcm3724 *) (dev->private))->dio_1 = 0;
((priv_pcm3724 *) (dev->private))->dio_2 = 0;
((struct priv_pcm3724 *) (dev->private))->dio_1 = 0;
((struct priv_pcm3724 *) (dev->private))->dio_2 = 0;

printk("comedi%d: pcm3724: board=%s, 0x%03lx ", dev->minor,
this_board->name, iobase);
Expand Down

0 comments on commit 2178bf9

Please sign in to comment.