Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 141570
b: refs/heads/master
c: 0ff297c
h: refs/heads/master
v: v3
  • Loading branch information
Bill Pemberton authored and Greg Kroah-Hartman committed Apr 3, 2009
1 parent f3536f9 commit 083bfe7
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: 324da11efaea562c8270834ac03c7c3df03aa79b
refs/heads/master: 0ff297c4ebf5f7119e928d74a9d952158d329aca
8 changes: 4 additions & 4 deletions trunk/drivers/staging/comedi/drivers/cb_pcimdda.c
Original file line number Diff line number Diff line change
Expand Up @@ -155,7 +155,7 @@ MODULE_DEVICE_TABLE(pci, 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 board_private_struct {
unsigned long registers; /* set by probe */
unsigned long dio_registers;
char attached_to_8255; /* boolean */
Expand All @@ -167,13 +167,13 @@ typedef struct {
/* Used for AO readback */
unsigned int ao_readback[MAX_AO_READBACK_CHANNELS];

} private;
};

/*
* most drivers define the following macro to make it easy to
* access the private structure.
*/
#define devpriv ((private *)dev->private)
#define devpriv ((struct board_private_struct *)dev->private)

/*
* The struct comedi_driver structure tells the Comedi core module
Expand Down Expand Up @@ -249,7 +249,7 @@ static int attach(struct comedi_device * dev, struct comedi_devconfig * it)
* if this function fails (returns negative) then the private area is
* kfree'd by comedi
*/
if (alloc_private(dev, sizeof(private)) < 0)
if (alloc_private(dev, sizeof(struct board_private_struct)) < 0)
return -ENOMEM;

/*
Expand Down

0 comments on commit 083bfe7

Please sign in to comment.