Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 141680
b: refs/heads/master
c: 450032a
h: refs/heads/master
v: v3
  • Loading branch information
Bill Pemberton authored and Greg Kroah-Hartman committed Apr 3, 2009
1 parent 7de26ac commit 2c6f082
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: 222ab1bc78dd8a48576e904da37fd6f71cb41a7e
refs/heads/master: 450032a318ebfc95121fc548442217592803f4a7
10 changes: 6 additions & 4 deletions trunk/drivers/staging/comedi/drivers/cb_pcidas64.c
Original file line number Diff line number Diff line change
Expand Up @@ -1065,7 +1065,8 @@ struct ext_clock_info {
};

/* this structure is for data unique to this hardware driver. */
typedef struct {
struct pcidas64_private {

struct pci_dev *hw_dev; // pointer to board's pci_dev struct
// base addresses (physical)
resource_size_t plx9080_phys_iobase;
Expand Down Expand Up @@ -1109,12 +1110,13 @@ typedef struct {
unsigned int ai_fifo_segment_length;
struct ext_clock_info ext_clock;
short ao_bounce_buffer[DAC_FIFO_SIZE];
} pcidas64_private;
};


/* inline function that makes it easier to
* access the private structure.
*/
static inline pcidas64_private *priv(struct comedi_device * dev)
static inline struct pcidas64_private *priv(struct comedi_device * dev)
{
return dev->private;
}
Expand Down Expand Up @@ -1685,7 +1687,7 @@ static int attach(struct comedi_device *dev, struct comedi_devconfig *it)
/*
* Allocate the private structure area.
*/
if (alloc_private(dev, sizeof(pcidas64_private)) < 0)
if (alloc_private(dev, sizeof(struct pcidas64_private)) < 0)
return -ENOMEM;

/*
Expand Down

0 comments on commit 2c6f082

Please sign in to comment.