From cf8e3f0c2de9566fb884ba25ba87ca1abf7660b0 Mon Sep 17 00:00:00 2001 From: Bill Pemberton Date: Mon, 16 Mar 2009 22:16:23 -0400 Subject: [PATCH] --- yaml --- r: 141621 b: refs/heads/master c: adf328432473a9baf2b7b0a50864d9736890fa8a h: refs/heads/master i: 141619: df2170d73b28f63205c7972ba4a5fe9eac8f9b18 v: v3 --- [refs] | 2 +- trunk/drivers/staging/comedi/drivers/ni_daq_700.c | 10 ++++++---- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 8071060d7d75..8399286e7e48 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 9f30c243c86483f24dc2687a8708985d147d63e0 +refs/heads/master: adf328432473a9baf2b7b0a50864d9736890fa8a diff --git a/trunk/drivers/staging/comedi/drivers/ni_daq_700.c b/trunk/drivers/staging/comedi/drivers/ni_daq_700.c index 1530416e4fa6..41c1e1ab5c00 100644 --- a/trunk/drivers/staging/comedi/drivers/ni_daq_700.c +++ b/trunk/drivers/staging/comedi/drivers/ni_daq_700.c @@ -91,11 +91,13 @@ static const dio700_board dio700_boards[] = { */ #define thisboard ((const dio700_board *)dev->board_ptr) -typedef struct { +struct dio700_private { + int data; /* number of data points left to be taken */ -} dio700_private; +}; + -#define devpriv ((dio700_private *)dev->private) +#define devpriv ((struct dio700_private *)dev->private) static struct comedi_driver driver_dio700 = { driver_name:"ni_daq_700", @@ -360,7 +362,7 @@ static int dio700_attach(struct comedi_device * dev, struct comedi_devconfig * i struct pcmcia_device *link; /* allocate and initialize dev->private */ - if (alloc_private(dev, sizeof(dio700_private)) < 0) + if (alloc_private(dev, sizeof(struct dio700_private)) < 0) return -ENOMEM; // get base address, irq etc. based on bustype