Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 141683
b: refs/heads/master
c: 47c30a2
h: refs/heads/master
i:
  141681: b3afd5c
  141679: 7de26ac
v: v3
  • Loading branch information
Bill Pemberton authored and Greg Kroah-Hartman committed Apr 3, 2009
1 parent 18db3d0 commit eca61ee
Show file tree
Hide file tree
Showing 2 changed files with 6 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: f4c6b31958afecc08c8e83f3bc25161ce4442542
refs/heads/master: 47c30a2cc336d493d624d8437f41c19a270bb672
9 changes: 5 additions & 4 deletions trunk/drivers/staging/comedi/drivers/ni_65xx.c
Original file line number Diff line number Diff line change
Expand Up @@ -282,14 +282,15 @@ static DEFINE_PCI_DEVICE_TABLE(ni_65xx_pci_table) = {

MODULE_DEVICE_TABLE(pci, ni_65xx_pci_table);

typedef struct {
struct ni_65xx_private {
struct mite_struct *mite;
unsigned int filter_interval;
unsigned short filter_enable[NI_65XX_MAX_NUM_PORTS];
unsigned short output_bits[NI_65XX_MAX_NUM_PORTS];
unsigned short dio_direction[NI_65XX_MAX_NUM_PORTS];
} ni_65xx_private;
static inline ni_65xx_private *private(struct comedi_device * dev)
};

static inline struct ni_65xx_private *private(struct comedi_device * dev)
{
return dev->private;
}
Expand Down Expand Up @@ -625,7 +626,7 @@ static int ni_65xx_attach(struct comedi_device * dev, struct comedi_devconfig *

printk("comedi%d: ni_65xx:", dev->minor);

if ((ret = alloc_private(dev, sizeof(ni_65xx_private))) < 0)
if ((ret = alloc_private(dev, sizeof(struct ni_65xx_private))) < 0)
return ret;

ret = ni_65xx_find_device(dev, it->options[0], it->options[1]);
Expand Down

0 comments on commit eca61ee

Please sign in to comment.