Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 141694
b: refs/heads/master
c: 2e93aa5
h: refs/heads/master
v: v3
  • Loading branch information
Bill Pemberton authored and Greg Kroah-Hartman committed Apr 3, 2009
1 parent a51aacc commit f503659
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: 30570f0dee2b0e3ede09e08eb5dfd514317a7587
refs/heads/master: 2e93aa5b5b8050090a22e162f9af6b18ca3ec47a
8 changes: 4 additions & 4 deletions trunk/drivers/staging/comedi/drivers/ni_pcidio.c
Original file line number Diff line number Diff line change
Expand Up @@ -390,16 +390,16 @@ static DEFINE_PCI_DEVICE_TABLE(ni_pcidio_pci_table) = {

MODULE_DEVICE_TABLE(pci, ni_pcidio_pci_table);

typedef struct {
struct nidio96_private {
struct mite_struct *mite;
int boardtype;
int dio;
unsigned short OpModeBits;
struct mite_channel *di_mite_chan;
struct mite_dma_descriptor_ring *di_mite_ring;
spinlock_t mite_channel_lock;
} nidio96_private;
#define devpriv ((nidio96_private *)dev->private)
};
#define devpriv ((struct nidio96_private *)dev->private)

static int ni_pcidio_cmdtest(struct comedi_device * dev, struct comedi_subdevice * s,
struct comedi_cmd * cmd);
Expand Down Expand Up @@ -1161,7 +1161,7 @@ static int nidio_attach(struct comedi_device * dev, struct comedi_devconfig * it

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

if ((ret = alloc_private(dev, sizeof(nidio96_private))) < 0)
if ((ret = alloc_private(dev, sizeof(struct nidio96_private))) < 0)
return ret;
spin_lock_init(&devpriv->mite_channel_lock);

Expand Down

0 comments on commit f503659

Please sign in to comment.