Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 141619
b: refs/heads/master
c: 75b8073
h: refs/heads/master
i:
  141617: 8882ba4
  141615: 03ca706
v: v3
  • Loading branch information
Bill Pemberton authored and Greg Kroah-Hartman committed Apr 3, 2009
1 parent 8a7ce61 commit df2170d
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 5 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: 3cc3872bbd097a2bcbe740b7041b3d35cc8f0d3e
refs/heads/master: 75b807393272fcfcf54d1188c667dc0fccd1fb69
10 changes: 6 additions & 4 deletions trunk/drivers/staging/comedi/drivers/ni_at_ao.c
Original file line number Diff line number Diff line change
Expand Up @@ -168,15 +168,17 @@ static const atao_board atao_boards[] = {

#define thisboard ((atao_board *)dev->board_ptr)

typedef struct {
struct atao_private {

unsigned short cfg1;
unsigned short cfg2;
unsigned short cfg3;

/* Used for AO readback */
unsigned int ao_readback[10];
} atao_private;
#define devpriv ((atao_private *)dev->private)
};

#define devpriv ((struct atao_private *)dev->private)

static int atao_attach(struct comedi_device * dev, struct comedi_devconfig * it);
static int atao_detach(struct comedi_device * dev);
Expand Down Expand Up @@ -230,7 +232,7 @@ static int atao_attach(struct comedi_device * dev, struct comedi_devconfig * it)

dev->board_name = thisboard->name;

if (alloc_private(dev, sizeof(atao_private)) < 0)
if (alloc_private(dev, sizeof(struct atao_private)) < 0)
return -ENOMEM;

if (alloc_subdevices(dev, 4) < 0)
Expand Down

0 comments on commit df2170d

Please sign in to comment.