Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 141534
b: refs/heads/master
c: 6e8131a
h: refs/heads/master
v: v3
  • Loading branch information
Bill Pemberton authored and Greg Kroah-Hartman committed Apr 3, 2009
1 parent 58a1e8f commit 045365c
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: 7875a00b702e62ebafe68cd2abf96570e2d747e5
refs/heads/master: 6e8131a86d6c1a9896282f572d17c447a85262ad
8 changes: 4 additions & 4 deletions trunk/drivers/staging/comedi/drivers/adv_pci1710.c
Original file line number Diff line number Diff line change
Expand Up @@ -266,7 +266,7 @@ static struct comedi_driver driver_pci1710 = {
.offset = sizeof(struct boardtype),
};

typedef struct {
struct pci1710_private {
struct pci_dev *pcidev; // ptr to PCI device
char valid; // card is usable
char neverending_ai; // we do unlimited AI
Expand Down Expand Up @@ -295,9 +295,9 @@ typedef struct {
unsigned int ai_timer2;
short ao_data[4]; // data output buffer
unsigned int cnt0_write_wait; // after a write, wait for update of the internal state
} pci1710_private;
};

#define devpriv ((pci1710_private *)dev->private)
#define devpriv ((struct pci1710_private *)dev->private)
#define this_board ((const struct boardtype *)dev->board_ptr)

/*
Expand Down Expand Up @@ -1334,7 +1334,7 @@ static int pci1710_attach(struct comedi_device * dev, struct comedi_devconfig *
opt_bus = it->options[0];
opt_slot = it->options[1];

if ((ret = alloc_private(dev, sizeof(pci1710_private))) < 0) {
if ((ret = alloc_private(dev, sizeof(struct pci1710_private))) < 0) {
rt_printk(" - Allocation failed!\n");
return -ENOMEM;
}
Expand Down

0 comments on commit 045365c

Please sign in to comment.