Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 141548
b: refs/heads/master
c: 692560d
h: refs/heads/master
v: v3
  • Loading branch information
Bill Pemberton authored and Greg Kroah-Hartman committed Apr 3, 2009
1 parent b03110c commit 63232e7
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: af105ad3f57421a36dd60c8f54edcebc7a09256b
refs/heads/master: 692560db4187c5c5e906f95c287d75e1b96e4846
8 changes: 4 additions & 4 deletions trunk/drivers/staging/comedi/drivers/amplc_dio200.c
Original file line number Diff line number Diff line change
Expand Up @@ -437,14 +437,14 @@ MODULE_DEVICE_TABLE(pci, dio200_pci_table);
/* this structure is for data unique to this hardware driver. If
several hardware drivers keep similar information in this structure,
feel free to suggest moving the variable to the struct comedi_device struct. */
typedef struct {
struct dio200_private {
#ifdef CONFIG_COMEDI_PCI
struct pci_dev *pci_dev; /* PCI device */
#endif
int intr_sd;
} dio200_private;
};

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

typedef struct {
unsigned long iobase; /* Counter base address */
Expand Down Expand Up @@ -1280,7 +1280,7 @@ static int dio200_attach(struct comedi_device * dev, struct comedi_devconfig * i
printk(KERN_DEBUG "comedi%d: %s: attach\n", dev->minor,
DIO200_DRIVER_NAME);

if ((ret = alloc_private(dev, sizeof(dio200_private))) < 0) {
if ((ret = alloc_private(dev, sizeof(struct dio200_private))) < 0) {
printk(KERN_ERR "comedi%d: error! out of memory!\n",
dev->minor);
return ret;
Expand Down

0 comments on commit 63232e7

Please sign in to comment.