Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 141595
b: refs/heads/master
c: 0c5a144
h: refs/heads/master
i:
  141593: 1aa91d4
  141591: 328bc95
v: v3
  • Loading branch information
Bill Pemberton authored and Greg Kroah-Hartman committed Apr 3, 2009
1 parent 39b01fa commit 32ffac2
Show file tree
Hide file tree
Showing 2 changed files with 5 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: ce422cf3569444116d7d826b274bd59cc34d3b28
refs/heads/master: 0c5a144d730a68967dfb3f8163260a142e3282e3
8 changes: 4 additions & 4 deletions trunk/drivers/staging/comedi/drivers/das1800.c
Original file line number Diff line number Diff line change
Expand Up @@ -463,7 +463,7 @@ static const struct das1800_board das1800_boards[] = {
*/
#define thisboard ((const struct das1800_board *)dev->board_ptr)

typedef struct {
struct das1800_private {
volatile unsigned int count; /* number of data points left to be taken */
unsigned int divisor1; /* value to load into board's counter 1 for timed conversions */
unsigned int divisor2; /* value to load into board's counter 2 for timed conversions */
Expand All @@ -481,9 +481,9 @@ typedef struct {
unsigned int dma_transfer_size; /* size of transfer currently used, in bytes */
unsigned long iobase2; /* secondary io address used for analog out on 'ao' boards */
short ao_update_bits; /* remembers the last write to the 'update' dac */
} das1800_private;
};

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

// analog out range for boards with basic analog out
static const struct comedi_lrange range_ao_1 = {
Expand Down Expand Up @@ -602,7 +602,7 @@ static int das1800_attach(struct comedi_device * dev, struct comedi_devconfig *
int retval;

/* allocate and initialize dev->private */
if (alloc_private(dev, sizeof(das1800_private)) < 0)
if (alloc_private(dev, sizeof(struct das1800_private)) < 0)
return -ENOMEM;

printk("comedi%d: %s: io 0x%lx", dev->minor, driver_das1800.driver_name,
Expand Down

0 comments on commit 32ffac2

Please sign in to comment.