Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 141611
b: refs/heads/master
c: 9beff27
h: refs/heads/master
i:
  141609: f93103e
  141607: fe4a44c
v: v3
  • Loading branch information
Bill Pemberton authored and Greg Kroah-Hartman committed Apr 3, 2009
1 parent e488050 commit 6b50c68
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 7 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: 217fbbbc74f136f35530cf9acb06d7231fbdc1f3
refs/heads/master: 9beff277bb14a844b5cb437fcdca9db7534ee44a
14 changes: 8 additions & 6 deletions trunk/drivers/staging/comedi/drivers/ke_counter.c
Original file line number Diff line number Diff line change
Expand Up @@ -61,22 +61,24 @@ MODULE_DEVICE_TABLE(pci, cnt_pci_table);

/*-- board specification structure ------------------------------------------*/

typedef struct {
struct cnt_board_struct {

const char *name;
int device_id;
int cnt_channel_nbr;
int cnt_bits;
} cnt_board_struct;
};


static const cnt_board_struct cnt_boards[] = {
static const struct cnt_board_struct cnt_boards[] = {
{
name: CNT_DRIVER_NAME,
device_id:CNT_CARD_DEVICE_ID,
cnt_channel_nbr:3,
cnt_bits:24}
};

#define cnt_board_nbr (sizeof(cnt_boards)/sizeof(cnt_board_struct))
#define cnt_board_nbr (sizeof(cnt_boards)/sizeof(struct cnt_board_struct))

/*-- device private structure -----------------------------------------------*/

Expand Down Expand Up @@ -148,7 +150,7 @@ static int cnt_attach(struct comedi_device * dev, struct comedi_devconfig * it)
{
struct comedi_subdevice *subdevice;
struct pci_dev *pci_device;
cnt_board_struct *board;
struct cnt_board_struct *board;
unsigned long io_base;
int error, i;

Expand Down Expand Up @@ -180,7 +182,7 @@ static int cnt_attach(struct comedi_device * dev, struct comedi_devconfig * it)
}

dev->board_ptr = cnt_boards + i;
board = (cnt_board_struct *) dev->
board = (struct cnt_board_struct *) dev->
board_ptr;
goto found;
}
Expand Down

0 comments on commit 6b50c68

Please sign in to comment.