Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 141632
b: refs/heads/master
c: 352dec6
h: refs/heads/master
v: v3
  • Loading branch information
Bill Pemberton authored and Greg Kroah-Hartman committed Apr 3, 2009
1 parent 414aaed commit f984be4
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: b81c8035ff531ae47b45f132cc0305d8c5c412c6
refs/heads/master: 352dec620aea9529180034fa461d290026ff57e9
10 changes: 6 additions & 4 deletions trunk/drivers/staging/comedi/drivers/gsc_hpdi.c
Original file line number Diff line number Diff line change
Expand Up @@ -301,7 +301,8 @@ static inline struct hpdi_board *board(const struct comedi_device * dev)
return (struct hpdi_board *) dev->board_ptr;
}

typedef struct {
struct hpdi_private {

struct pci_dev *hw_dev; // pointer to board's pci_dev struct
// base addresses (physical)
resource_size_t plx9080_phys_iobase;
Expand All @@ -322,9 +323,10 @@ typedef struct {
volatile uint32_t bits[24]; // software copies of values written to hpdi registers
volatile unsigned int block_size; // number of bytes at which to generate COMEDI_CB_BLOCK events
unsigned dio_config_output:1;
} hpdi_private;
};


static inline hpdi_private *priv(struct comedi_device * dev)
static inline struct hpdi_private *priv(struct comedi_device * dev)
{
return dev->private;
}
Expand Down Expand Up @@ -562,7 +564,7 @@ static int hpdi_attach(struct comedi_device * dev, struct comedi_devconfig * it)

printk("comedi%d: gsc_hpdi\n", dev->minor);

if (alloc_private(dev, sizeof(hpdi_private)) < 0)
if (alloc_private(dev, sizeof(struct hpdi_private)) < 0)
return -ENOMEM;

pcidev = NULL;
Expand Down

0 comments on commit f984be4

Please sign in to comment.