Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 141603
b: refs/heads/master
c: 7f435c0
h: refs/heads/master
i:
  141601: 08a6119
  141599: 4c0925b
v: v3
  • Loading branch information
Bill Pemberton authored and Greg Kroah-Hartman committed Apr 3, 2009
1 parent 793534c commit 57dfea4
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: 4634b8154e23ced2f70a00ab3a22e6b1987fc348
refs/heads/master: 7f435c068c488527842461b9872c0484a3c9ae61
10 changes: 6 additions & 4 deletions trunk/drivers/staging/comedi/drivers/dt2801.c
Original file line number Diff line number Diff line change
Expand Up @@ -220,11 +220,13 @@ static const struct dt2801_board boardtypes[] = {
#define n_boardtypes ((sizeof(boardtypes))/(sizeof(boardtypes[0])))
#define boardtype (*(const struct dt2801_board *)dev->board_ptr)

typedef struct {
struct dt2801_private {

const struct comedi_lrange *dac_range_types[2];
unsigned int ao_readback[2];
} dt2801_private;
#define devpriv ((dt2801_private *)dev->private)
};

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

static int dt2801_ai_insn_read(struct comedi_device * dev, struct comedi_subdevice * s,
struct comedi_insn * insn, unsigned int * data);
Expand Down Expand Up @@ -521,7 +523,7 @@ static int dt2801_attach(struct comedi_device * dev, struct comedi_devconfig * i
if ((ret = alloc_subdevices(dev, 4)) < 0)
goto out;

if ((ret = alloc_private(dev, sizeof(dt2801_private))) < 0)
if ((ret = alloc_private(dev, sizeof(struct dt2801_private))) < 0)
goto out;

dev->board_name = boardtype.name;
Expand Down

0 comments on commit 57dfea4

Please sign in to comment.