Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 141643
b: refs/heads/master
c: e2b523a
h: refs/heads/master
i:
  141641: cc492e1
  141639: 6880b36
v: v3
  • Loading branch information
Bill Pemberton authored and Greg Kroah-Hartman committed Apr 3, 2009
1 parent 63aa34e commit e3b896b
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 9 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: 201007e8bc7b3e94be823eda5a684199152410d1
refs/heads/master: e2b523aab1b04e7edc092588abbafa67f560deb4
18 changes: 10 additions & 8 deletions trunk/drivers/staging/comedi/drivers/serial2002.c
Original file line number Diff line number Diff line change
Expand Up @@ -401,16 +401,18 @@ static void serial_2002_open(struct comedi_device * dev)
printk("serial_2002: file open error = %ld\n",
PTR_ERR(devpriv->tty));
} else {
typedef struct {
struct config_t {

int kind;
int bits;
int min;
int max;
} config_t;
config_t dig_in_config[32];
config_t dig_out_config[32];
config_t chan_in_config[32];
config_t chan_out_config[32];
};

struct config_t dig_in_config[32];
struct config_t dig_out_config[32];
struct config_t chan_in_config[32];
struct config_t chan_out_config[32];
int i;

for (i = 0; i < 32; i++) {
Expand Down Expand Up @@ -443,7 +445,7 @@ static void serial_2002_open(struct comedi_device * dev)
break;
} else {
int command, channel, kind;
config_t *cur_config = 0;
struct config_t *cur_config = 0;

channel = data.value & 0x1f;
kind = (data.value >> 5) & 0x7;
Expand Down Expand Up @@ -554,7 +556,7 @@ static void serial_2002_open(struct comedi_device * dev)
}
for (i = 0; i <= 4; i++) {
// Fill in subdev data
config_t *c;
struct config_t *c;
unsigned char *mapping = 0;
struct serial2002_range_table_t *range = 0;
int kind = 0;
Expand Down

0 comments on commit e3b896b

Please sign in to comment.