Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 205563
b: refs/heads/master
c: 8b83e00
h: refs/heads/master
i:
  205561: 314612e
  205559: e52d168
v: v3
  • Loading branch information
Gustavo Silva authored and Greg Kroah-Hartman committed Jun 17, 2010
1 parent 0a93031 commit b38c441
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: 4c68fb42c2a39b89daca2b7175eb93ffe6860da4
refs/heads/master: 8b83e005d11bce0f9a59d9be337a285e6cc487a6
12 changes: 7 additions & 5 deletions trunk/drivers/staging/comedi/drivers/pcmda12.c
Original file line number Diff line number Diff line change
Expand Up @@ -157,7 +157,8 @@ static int pcmda12_attach(struct comedi_device *dev,
unsigned long iobase;

iobase = it->options[0];
printk("comedi%d: %s: io: %lx %s ", dev->minor, driver.driver_name,
printk(KERN_INFO
"comedi%d: %s: io: %lx %s ", dev->minor, driver.driver_name,
iobase, it->options[1] ? "simultaneous xfer mode enabled" : "");

if (!request_region(iobase, IOSIZE, driver.driver_name)) {
Expand All @@ -177,7 +178,7 @@ static int pcmda12_attach(struct comedi_device *dev,
* convenient macro defined in comedidev.h.
*/
if (alloc_private(dev, sizeof(struct pcmda12_private)) < 0) {
printk("cannot allocate private data structure\n");
printk(KERN_ERR "cannot allocate private data structure\n");
return -ENOMEM;
}

Expand All @@ -191,7 +192,7 @@ static int pcmda12_attach(struct comedi_device *dev,
* 96-channel version of the board.
*/
if (alloc_subdevices(dev, 1) < 0) {
printk("cannot allocate subdevice data structures\n");
printk(KERN_ERR "cannot allocate subdevice data structures\n");
return -ENOMEM;
}

Expand All @@ -207,7 +208,7 @@ static int pcmda12_attach(struct comedi_device *dev,

zero_chans(dev); /* clear out all the registers, basically */

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

return 1;
}
Expand All @@ -222,7 +223,8 @@ static int pcmda12_attach(struct comedi_device *dev,
*/
static int pcmda12_detach(struct comedi_device *dev)
{
printk("comedi%d: %s: remove\n", dev->minor, driver.driver_name);
printk(KERN_INFO
"comedi%d: %s: remove\n", dev->minor, driver.driver_name);
if (dev->iobase)
release_region(dev->iobase, IOSIZE);
return 0;
Expand Down

0 comments on commit b38c441

Please sign in to comment.