Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 219704
b: refs/heads/master
c: 8cbf7a9
h: refs/heads/master
v: v3
  • Loading branch information
Sunny Aujla authored and Greg Kroah-Hartman committed Aug 31, 2010
1 parent 979ab3c commit 355b40b
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 8 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: b0ea846105979b04327941d842d40236257117da
refs/heads/master: 8cbf7a9e39e21d95c935e5e1a66050e769427569
14 changes: 7 additions & 7 deletions trunk/drivers/staging/comedi/drivers/dt2817.c
Original file line number Diff line number Diff line change
Expand Up @@ -82,13 +82,13 @@ static int dt2817_dio_insn_config(struct comedi_device *dev,
return -EINVAL;

chan = CR_CHAN(insn->chanspec);
if (chan < 8) {
if (chan < 8)
mask = 0xff;
} else if (chan < 16) {
else if (chan < 16)
mask = 0xff00;
} else if (chan < 24) {
else if (chan < 24)
mask = 0xff0000;
} else
else
mask = 0xff000000;
if (data[0])
s->io_bits |= mask;
Expand Down Expand Up @@ -152,7 +152,7 @@ static int dt2817_attach(struct comedi_device *dev, struct comedi_devconfig *it)
unsigned long iobase;

iobase = it->options[0];
printk("comedi%d: dt2817: 0x%04lx ", dev->minor, iobase);
printk(KERN_INFO "comedi%d: dt2817: 0x%04lx ", dev->minor, iobase);
if (!request_region(iobase, DT2817_SIZE, "dt2817")) {
printk("I/O port conflict\n");
return -EIO;
Expand All @@ -177,14 +177,14 @@ static int dt2817_attach(struct comedi_device *dev, struct comedi_devconfig *it)
s->state = 0;
outb(0, dev->iobase + DT2817_CR);

printk("\n");
printk(KERN_INFO "\n");

return 0;
}

static int dt2817_detach(struct comedi_device *dev)
{
printk("comedi%d: dt2817: remove\n", dev->minor);
printk(KERN_INFO "comedi%d: dt2817: remove\n", dev->minor);

if (dev->iobase)
release_region(dev->iobase, DT2817_SIZE);
Expand Down

0 comments on commit 355b40b

Please sign in to comment.