Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 141661
b: refs/heads/master
c: fe0ff17
h: refs/heads/master
i:
  141659: 357112b
v: v3
  • Loading branch information
Bill Pemberton authored and Greg Kroah-Hartman committed Apr 3, 2009
1 parent 2178bf9 commit 9d043e8
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: 8e7b864b3c8357dd8318ade3970cd3b5fe0571e0
refs/heads/master: fe0ff175329a83de8f9aac7c0b759cde15cb2247
10 changes: 6 additions & 4 deletions trunk/drivers/staging/comedi/drivers/pcl816.c
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,7 @@ static const boardtype boardtypes[] = {
};

#define n_boardtypes (sizeof(boardtypes)/sizeof(boardtype))
#define devpriv ((pcl816_private *)dev->private)
#define devpriv ((struct pcl816_private *)dev->private)
#define this_board ((const boardtype *)dev->board_ptr)

static int pcl816_attach(struct comedi_device * dev, struct comedi_devconfig * it);
Expand All @@ -166,7 +166,8 @@ static struct comedi_driver driver_pcl816 = {

COMEDI_INITCLEANUP(driver_pcl816);

typedef struct {
struct pcl816_private {

unsigned int dma; // used DMA, 0=don't use DMA
int dma_rtc; // 1=RTC used with DMA, 0=no RTC alloc
#ifdef unused
Expand Down Expand Up @@ -204,7 +205,8 @@ typedef struct {
struct timer_list rtc_irq_timer; // timer for RTC sanity check
unsigned long rtc_freq; // RTC int freq
#endif
} pcl816_private;
};


/*
==============================================================================
Expand Down Expand Up @@ -1037,7 +1039,7 @@ static int pcl816_attach(struct comedi_device * dev, struct comedi_devconfig * i
return -EIO;
}

if ((ret = alloc_private(dev, sizeof(pcl816_private))) < 0)
if ((ret = alloc_private(dev, sizeof(struct pcl816_private))) < 0)
return ret; /* Can't alloc mem */

/* set up some name stuff */
Expand Down

0 comments on commit 9d043e8

Please sign in to comment.