From df2170d73b28f63205c7972ba4a5fe9eac8f9b18 Mon Sep 17 00:00:00 2001 From: Bill Pemberton Date: Mon, 16 Mar 2009 22:16:12 -0400 Subject: [PATCH] --- yaml --- r: 141619 b: refs/heads/master c: 75b807393272fcfcf54d1188c667dc0fccd1fb69 h: refs/heads/master i: 141617: 8882ba4ba11339a4cae7a6152c2bf37a01c88991 141615: 03ca706cbe562cc2e0d6e65e52b31963bf38618f v: v3 --- [refs] | 2 +- trunk/drivers/staging/comedi/drivers/ni_at_ao.c | 10 ++++++---- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 71f9426af85b..1b4e0a42ee31 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 3cc3872bbd097a2bcbe740b7041b3d35cc8f0d3e +refs/heads/master: 75b807393272fcfcf54d1188c667dc0fccd1fb69 diff --git a/trunk/drivers/staging/comedi/drivers/ni_at_ao.c b/trunk/drivers/staging/comedi/drivers/ni_at_ao.c index f8c950d52ab6..efacfda03b2f 100644 --- a/trunk/drivers/staging/comedi/drivers/ni_at_ao.c +++ b/trunk/drivers/staging/comedi/drivers/ni_at_ao.c @@ -168,15 +168,17 @@ static const atao_board atao_boards[] = { #define thisboard ((atao_board *)dev->board_ptr) -typedef struct { +struct atao_private { + unsigned short cfg1; unsigned short cfg2; unsigned short cfg3; /* Used for AO readback */ unsigned int ao_readback[10]; -} atao_private; -#define devpriv ((atao_private *)dev->private) +}; + +#define devpriv ((struct atao_private *)dev->private) static int atao_attach(struct comedi_device * dev, struct comedi_devconfig * it); static int atao_detach(struct comedi_device * dev); @@ -230,7 +232,7 @@ static int atao_attach(struct comedi_device * dev, struct comedi_devconfig * it) dev->board_name = thisboard->name; - if (alloc_private(dev, sizeof(atao_private)) < 0) + if (alloc_private(dev, sizeof(struct atao_private)) < 0) return -ENOMEM; if (alloc_subdevices(dev, 4) < 0)