Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 141635
b: refs/heads/master
c: e1c8638
h: refs/heads/master
i:
  141633: 3f836f3
  141631: 414aaed
v: v3
  • Loading branch information
Bill Pemberton authored and Greg Kroah-Hartman committed Apr 3, 2009
1 parent 326a860 commit b9a7899
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 5 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 2e2269f90f2bb4e9438849f0690daba5cba29fc5
refs/heads/master: e1c8638f3fb47c25b8dba170aadc8e29619fcd67
10 changes: 6 additions & 4 deletions trunk/drivers/staging/comedi/drivers/pcl711.c
Original file line number Diff line number Diff line change
Expand Up @@ -168,7 +168,8 @@ static struct comedi_driver driver_pcl711 = {

COMEDI_INITCLEANUP(driver_pcl711);

typedef struct {
struct pcl711_private {

int board;
int adchan;
int ntrig;
Expand All @@ -177,9 +178,10 @@ typedef struct {
unsigned int ao_readback[2];
unsigned int divisor1;
unsigned int divisor2;
} pcl711_private;
};


#define devpriv ((pcl711_private *)dev->private)
#define devpriv ((struct pcl711_private *)dev->private)

static irqreturn_t pcl711_interrupt(int irq, void *d PT_REGS_ARG)
{
Expand Down Expand Up @@ -548,7 +550,7 @@ static int pcl711_attach(struct comedi_device * dev, struct comedi_devconfig * i

if ((ret = alloc_subdevices(dev, 4)) < 0)
return ret;
if ((ret = alloc_private(dev, sizeof(pcl711_private))) < 0)
if ((ret = alloc_private(dev, sizeof(struct pcl711_private))) < 0)
return ret;

s = dev->subdevices + 0;
Expand Down

0 comments on commit b9a7899

Please sign in to comment.