Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 141628
b: refs/heads/master
c: b3fb588
h: refs/heads/master
v: v3
  • Loading branch information
Bill Pemberton authored and Greg Kroah-Hartman committed Apr 3, 2009
1 parent 609d09c commit 20f2105
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 6 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: 6dc1ece008ab4e2bdddec3eca6d326a16b4f9849
refs/heads/master: b3fb588d463c575706fe80e9c30bf4b1c7702034
12 changes: 7 additions & 5 deletions trunk/drivers/staging/comedi/drivers/serial2002.c
Original file line number Diff line number Diff line change
Expand Up @@ -60,11 +60,13 @@ static const serial2002_board serial2002_boards[] = {
*/
#define thisboard ((const serial2002_board *)dev->board_ptr)

typedef struct {
struct serial2002_range_table_t {

// HACK...
int length;
struct comedi_krange range;
} serial2002_range_table_t;
};


typedef struct {
int port; // /dev/ttyS<port>
Expand All @@ -76,7 +78,7 @@ typedef struct {
unsigned char analog_in_mapping[32];
unsigned char analog_out_mapping[32];
unsigned char encoder_in_mapping[32];
serial2002_range_table_t in_range[32], out_range[32];
struct serial2002_range_table_t in_range[32], out_range[32];
} serial2002_private;

/*
Expand Down Expand Up @@ -554,7 +556,7 @@ static void serial_2002_open(struct comedi_device * dev)
// Fill in subdev data
config_t *c;
unsigned char *mapping = 0;
serial2002_range_table_t *range = 0;
struct serial2002_range_table_t *range = 0;
int kind = 0;

switch (i) {
Expand Down Expand Up @@ -623,7 +625,7 @@ static void serial_2002_open(struct comedi_device * dev)
s->range_table = 0;
s->range_table_list = range_table_list =
kmalloc(sizeof
(serial2002_range_table_t) *
(struct serial2002_range_table_t) *
s->n_chan, GFP_KERNEL);
}
for (chan = 0, j = 0; j < 32; j++) {
Expand Down

0 comments on commit 20f2105

Please sign in to comment.