From fe7825b2f2318d6d7f0ed05e73fbd52676078e57 Mon Sep 17 00:00:00 2001 From: Bill Pemberton Date: Mon, 16 Mar 2009 22:14:52 -0400 Subject: [PATCH] --- yaml --- r: 141604 b: refs/heads/master c: ca6f10ca8630d709e0d291fb9601f8c8d81c19a0 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/staging/comedi/drivers/dt2814.c | 10 ++++++---- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 1c7b669bfc51..00164f166a1d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 7f435c068c488527842461b9872c0484a3c9ae61 +refs/heads/master: ca6f10ca8630d709e0d291fb9601f8c8d81c19a0 diff --git a/trunk/drivers/staging/comedi/drivers/dt2814.c b/trunk/drivers/staging/comedi/drivers/dt2814.c index 660079acd223..8320139160a4 100644 --- a/trunk/drivers/staging/comedi/drivers/dt2814.c +++ b/trunk/drivers/staging/comedi/drivers/dt2814.c @@ -72,11 +72,13 @@ COMEDI_INITCLEANUP(driver_dt2814); static irqreturn_t dt2814_interrupt(int irq, void *dev PT_REGS_ARG); -typedef struct { +struct dt2814_private { + int ntrig; int curadchan; -} dt2814_private; -#define devpriv ((dt2814_private *)dev->private) +}; + +#define devpriv ((struct dt2814_private *)dev->private) #define DT2814_TIMEOUT 10 #define DT2814_MAX_SPEED 100000 /* Arbitrary 10 khz limit */ @@ -309,7 +311,7 @@ static int dt2814_attach(struct comedi_device * dev, struct comedi_devconfig * i if ((ret = alloc_subdevices(dev, 1)) < 0) return ret; - if ((ret = alloc_private(dev, sizeof(dt2814_private))) < 0) + if ((ret = alloc_private(dev, sizeof(struct dt2814_private))) < 0) return ret; s = dev->subdevices + 0;