Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 141617
b: refs/heads/master
c: 8ce8a1f
h: refs/heads/master
i:
  141615: 03ca706
v: v3
  • Loading branch information
Bill Pemberton authored and Greg Kroah-Hartman committed Apr 3, 2009
1 parent e422fe1 commit 8882ba4
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: 0cb5e8ff4502d60967177038e2d740dae759e4b2
refs/heads/master: 8ce8a1fff26a88498cfa435cf964bcba87682daf
10 changes: 6 additions & 4 deletions trunk/drivers/staging/comedi/drivers/ni_670x.c
Original file line number Diff line number Diff line change
Expand Up @@ -98,14 +98,16 @@ MODULE_DEVICE_TABLE(pci, ni_670x_pci_table);

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

typedef struct {
struct ni_670x_private {

struct mite_struct *mite;
int boardtype;
int dio;
unsigned int ao_readback[32];
} ni_670x_private;
};


#define devpriv ((ni_670x_private *)dev->private)
#define devpriv ((struct ni_670x_private *)dev->private)
#define n_ni_670x_boards (sizeof(ni_670x_boards)/sizeof(ni_670x_boards[0]))

static int ni_670x_attach(struct comedi_device * dev, struct comedi_devconfig * it);
Expand Down Expand Up @@ -141,7 +143,7 @@ static int ni_670x_attach(struct comedi_device * dev, struct comedi_devconfig *

printk("comedi%d: ni_670x: ", dev->minor);

if ((ret = alloc_private(dev, sizeof(ni_670x_private))) < 0)
if ((ret = alloc_private(dev, sizeof(struct ni_670x_private))) < 0)
return ret;

ret = ni_670x_find_device(dev, it->options[0], it->options[1]);
Expand Down

0 comments on commit 8882ba4

Please sign in to comment.