Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 141637
b: refs/heads/master
c: 51091b5
h: refs/heads/master
i:
  141635: b9a7899
v: v3
  • Loading branch information
Bill Pemberton authored and Greg Kroah-Hartman committed Apr 3, 2009
1 parent 933d52f commit 34636db
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: bf7f0610c6c215fb8a8cd26b697902810ee5b9e9
refs/heads/master: 51091b5420c564093d721d2dad99a55bbb22d0d0
10 changes: 6 additions & 4 deletions trunk/drivers/staging/comedi/drivers/pcl812.c
Original file line number Diff line number Diff line change
Expand Up @@ -386,7 +386,8 @@ static struct comedi_driver driver_pcl812 = {

COMEDI_INITCLEANUP(driver_pcl812);

typedef struct {
struct pcl812_private {

unsigned char valid; // =1 device is OK
unsigned char dma; // >0 use dma ( usedDMA channel)
unsigned char use_diff; // =1 diff inputs
Expand Down Expand Up @@ -418,9 +419,10 @@ typedef struct {
unsigned int last_dma_run; // how many bytes to transfer on last DMA buffer
unsigned int max_812_ai_mode0_rangewait; // setling time for gain
unsigned int ao_readback[2]; // data for AO readback
} pcl812_private;
};


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

/*
==============================================================================
Expand Down Expand Up @@ -1282,7 +1284,7 @@ static int pcl812_attach(struct comedi_device * dev, struct comedi_devconfig * i
}
dev->iobase = iobase;

if ((ret = alloc_private(dev, sizeof(pcl812_private))) < 0) {
if ((ret = alloc_private(dev, sizeof(struct pcl812_private))) < 0) {
free_resources(dev);
return ret; /* Can't alloc mem */
}
Expand Down

0 comments on commit 34636db

Please sign in to comment.