Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 141641
b: refs/heads/master
c: 9335f26
h: refs/heads/master
i:
  141639: 6880b36
v: v3
  • Loading branch information
Bill Pemberton authored and Greg Kroah-Hartman committed Apr 3, 2009
1 parent 32a46ca commit cc492e1
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: 70a6001aeffeaa12f2a1c21470e8f3bdfb6ef8e7
refs/heads/master: 9335f2613b6beca0f3f3e20ce5a550d1ffe66aa2
8 changes: 4 additions & 4 deletions trunk/drivers/staging/comedi/drivers/rti800.c
Original file line number Diff line number Diff line change
Expand Up @@ -145,7 +145,7 @@ COMEDI_INITCLEANUP(driver_rti800);

static irqreturn_t rti800_interrupt(int irq, void *dev PT_REGS_ARG);

typedef struct {
struct rti800_private {
enum {
adc_diff, adc_pseudodiff, adc_singleended
} adc_mux;
Expand All @@ -164,9 +164,9 @@ typedef struct {
const struct comedi_lrange *ao_range_type_list[2];
unsigned int ao_readback[2];
int muxgain_bits;
} rti800_private;
};

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

#define RTI800_TIMEOUT 100

Expand Down Expand Up @@ -351,7 +351,7 @@ static int rti800_attach(struct comedi_device * dev, struct comedi_devconfig * i

if ((ret = alloc_subdevices(dev, 4)) < 0)
return ret;
if ((ret = alloc_private(dev, sizeof(rti800_private))) < 0)
if ((ret = alloc_private(dev, sizeof(struct rti800_private))) < 0)
return ret;

devpriv->adc_mux = it->options[2];
Expand Down

0 comments on commit cc492e1

Please sign in to comment.