Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 186747
b: refs/heads/master
c: 83c41da
h: refs/heads/master
i:
  186745: 25bc7b6
  186743: 12e7e3d
v: v3
  • Loading branch information
Benjamin Adolphi authored and Greg Kroah-Hartman committed Mar 4, 2010
1 parent ed886f0 commit a748263
Show file tree
Hide file tree
Showing 2 changed files with 4 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: 0acc516aee7b1527ad125a53deff328ef29be9e6
refs/heads/master: 83c41dabcca05eacc5917928a3e6a3bdfefad652
8 changes: 3 additions & 5 deletions trunk/drivers/staging/comedi/drivers/rti802.c
Original file line number Diff line number Diff line change
Expand Up @@ -106,9 +106,9 @@ static int rti802_attach(struct comedi_device *dev, struct comedi_devconfig *it)
unsigned long iobase;

iobase = it->options[0];
printk("comedi%d: rti802: 0x%04lx ", dev->minor, iobase);
printk(KERN_INFO "comedi%d: rti802: 0x%04lx ", dev->minor, iobase);
if (!request_region(iobase, RTI802_SIZE, "rti802")) {
printk("I/O port conflict\n");
printk(KERN_WARNING "I/O port conflict\n");
return -EIO;
}
dev->iobase = iobase;
Expand Down Expand Up @@ -138,14 +138,12 @@ static int rti802_attach(struct comedi_device *dev, struct comedi_devconfig *it)
? &range_unipolar10 : &range_bipolar10;
}

printk("\n");

return 0;
}

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

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

0 comments on commit a748263

Please sign in to comment.