From 7fb86eef81ca893febc8a68415e95f020eb53a14 Mon Sep 17 00:00:00 2001 From: Bill Pemberton Date: Mon, 16 Mar 2009 22:10:34 -0400 Subject: [PATCH] --- yaml --- r: 141559 b: refs/heads/master c: bfae362ab6a9737e67a07ff82632a16181bb2d3c h: refs/heads/master i: 141557: b529bd708f88482cd75a6aa289ba463a0e36abfd 141555: 59dc71e27f41f7c42a967511ec1f6d8365e4a80d 141551: c45e37782b7c309fa287b030da3a040ddb5262b9 v: v3 --- [refs] | 2 +- trunk/drivers/staging/comedi/drivers/cb_das16_cs.c | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 76e300e192fd..88200d2b2cf0 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 3281a63d0b1eecbb21848c3e123c2fc0cd1d4a80 +refs/heads/master: bfae362ab6a9737e67a07ff82632a16181bb2d3c diff --git a/trunk/drivers/staging/comedi/drivers/cb_das16_cs.c b/trunk/drivers/staging/comedi/drivers/cb_das16_cs.c index 12f0085b1894..fc08d039705c 100644 --- a/trunk/drivers/staging/comedi/drivers/cb_das16_cs.c +++ b/trunk/drivers/staging/comedi/drivers/cb_das16_cs.c @@ -80,14 +80,14 @@ static const struct das16cs_board das16cs_boards[] = { #define n_boards (sizeof(das16cs_boards)/sizeof(das16cs_boards[0])) #define thisboard ((const struct das16cs_board *)dev->board_ptr) -typedef struct { +struct das16cs_private { struct pcmcia_device *link; unsigned int ao_readback[2]; unsigned short status1; unsigned short status2; -} das16cs_private; -#define devpriv ((das16cs_private *)dev->private) +}; +#define devpriv ((struct das16cs_private *)dev->private) static int das16cs_attach(struct comedi_device * dev, struct comedi_devconfig * it); static int das16cs_detach(struct comedi_device * dev); @@ -201,7 +201,7 @@ static int das16cs_attach(struct comedi_device * dev, struct comedi_devconfig * dev->board_name = thisboard->name; - if (alloc_private(dev, sizeof(das16cs_private)) < 0) + if (alloc_private(dev, sizeof(struct das16cs_private)) < 0) return -ENOMEM; if (alloc_subdevices(dev, 4) < 0)