Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 141631
b: refs/heads/master
c: b81c803
h: refs/heads/master
i:
  141629: 024dfb6
  141627: 609d09c
  141623: 1996bd6
  141615: 03ca706
  141599: 4c0925b
  141567: 314dd18
v: v3
  • Loading branch information
Bill Pemberton authored and Greg Kroah-Hartman committed Apr 3, 2009
1 parent 0fc542c commit 414aaed
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: 60efa611c788c4f5b9fdc206aeb9e7c91e0c3ffb
refs/heads/master: b81c8035ff531ae47b45f132cc0305d8c5c412c6
10 changes: 6 additions & 4 deletions trunk/drivers/staging/comedi/drivers/dt3000.c
Original file line number Diff line number Diff line change
Expand Up @@ -262,16 +262,18 @@ MODULE_DEVICE_TABLE(pci, dt3k_pci_table);
#define DT3000_CHANNEL_MODE_SE 0
#define DT3000_CHANNEL_MODE_DI 1

typedef struct {
struct dt3k_private {

struct pci_dev *pci_dev;
resource_size_t phys_addr;
void *io_addr;
unsigned int lock;
unsigned int ao_readback[2];
unsigned int ai_front;
unsigned int ai_rear;
} dt3k_private;
#define devpriv ((dt3k_private *)dev->private)
};

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

static int dt3000_attach(struct comedi_device * dev, struct comedi_devconfig * it);
static int dt3000_detach(struct comedi_device * dev);
Expand Down Expand Up @@ -809,7 +811,7 @@ static int dt3000_attach(struct comedi_device * dev, struct comedi_devconfig * i
bus = it->options[0];
slot = it->options[1];

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

ret = dt_pci_probe(dev, bus, slot);
Expand Down

0 comments on commit 414aaed

Please sign in to comment.