From 34636dbc1645edf5f5f4df5ae9978541de61a287 Mon Sep 17 00:00:00 2001 From: Bill Pemberton Date: Mon, 16 Mar 2009 22:18:37 -0400 Subject: [PATCH] --- yaml --- r: 141637 b: refs/heads/master c: 51091b5420c564093d721d2dad99a55bbb22d0d0 h: refs/heads/master i: 141635: b9a7899594a6a37a3fc315968dc52378e2ed5285 v: v3 --- [refs] | 2 +- trunk/drivers/staging/comedi/drivers/pcl812.c | 10 ++++++---- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 0ece9e2c3287..0d6921836049 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: bf7f0610c6c215fb8a8cd26b697902810ee5b9e9 +refs/heads/master: 51091b5420c564093d721d2dad99a55bbb22d0d0 diff --git a/trunk/drivers/staging/comedi/drivers/pcl812.c b/trunk/drivers/staging/comedi/drivers/pcl812.c index 07a109839b42..424e8096624b 100644 --- a/trunk/drivers/staging/comedi/drivers/pcl812.c +++ b/trunk/drivers/staging/comedi/drivers/pcl812.c @@ -386,7 +386,8 @@ static struct comedi_driver driver_pcl812 = { COMEDI_INITCLEANUP(driver_pcl812); -typedef struct { +struct pcl812_private { + unsigned char valid; // =1 device is OK unsigned char dma; // >0 use dma ( usedDMA channel) unsigned char use_diff; // =1 diff inputs @@ -418,9 +419,10 @@ typedef struct { unsigned int last_dma_run; // how many bytes to transfer on last DMA buffer unsigned int max_812_ai_mode0_rangewait; // setling time for gain unsigned int ao_readback[2]; // data for AO readback -} pcl812_private; +}; + -#define devpriv ((pcl812_private *)dev->private) +#define devpriv ((struct pcl812_private *)dev->private) /* ============================================================================== @@ -1282,7 +1284,7 @@ static int pcl812_attach(struct comedi_device * dev, struct comedi_devconfig * i } dev->iobase = iobase; - if ((ret = alloc_private(dev, sizeof(pcl812_private))) < 0) { + if ((ret = alloc_private(dev, sizeof(struct pcl812_private))) < 0) { free_resources(dev); return ret; /* Can't alloc mem */ }