Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 324883
b: refs/heads/master
c: 30c4d3b
h: refs/heads/master
i:
  324881: 8755750
  324879: b9891e5
v: v3
  • Loading branch information
H Hartley Sweeten authored and Greg Kroah-Hartman committed Sep 6, 2012
1 parent 0651673 commit 3fa8ca9
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 10 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: 35fcaeb87d14c2385dac6ef1520e136f288d1bd6
refs/heads/master: 30c4d3b862aa97c52a180c458f471e21a2e4db23
18 changes: 9 additions & 9 deletions trunk/drivers/staging/comedi/drivers/ke_counter.c
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@ static int cnt_attach_pci(struct comedi_device *dev,
struct pci_dev *pcidev)
{
const struct cnt_board_struct *board;
struct comedi_subdevice *subdevice;
struct comedi_subdevice *s;
int ret;

comedi_set_hw_dev(dev, &pcidev->dev);
Expand All @@ -145,15 +145,15 @@ static int cnt_attach_pci(struct comedi_device *dev,
if (ret)
return ret;

subdevice = dev->subdevices + 0;
dev->read_subdev = subdevice;
s = dev->subdevices + 0;
dev->read_subdev = s;

subdevice->type = COMEDI_SUBD_COUNTER;
subdevice->subdev_flags = SDF_READABLE /* | SDF_COMMON */ ;
subdevice->n_chan = board->cnt_channel_nbr;
subdevice->maxdata = (1 << board->cnt_bits) - 1;
subdevice->insn_read = cnt_rinsn;
subdevice->insn_write = cnt_winsn;
s->type = COMEDI_SUBD_COUNTER;
s->subdev_flags = SDF_READABLE /* | SDF_COMMON */ ;
s->n_chan = board->cnt_channel_nbr;
s->maxdata = (1 << board->cnt_bits) - 1;
s->insn_read = cnt_rinsn;
s->insn_write = cnt_winsn;

/* select 20MHz clock */
outb(3, dev->iobase + 248);
Expand Down

0 comments on commit 3fa8ca9

Please sign in to comment.