Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 197144
b: refs/heads/master
c: 3fffdf2
h: refs/heads/master
v: v3
  • Loading branch information
Mark Rankilor authored and Greg Kroah-Hartman committed May 11, 2010
1 parent 6c00612 commit 931324f
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 4 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: 3c034cce822d7422566e838de71ed99e024d5f2d
refs/heads/master: 3fffdf2045d0dbca3833f8f54ae41ce5f2c0b8fa
8 changes: 5 additions & 3 deletions trunk/drivers/staging/comedi/comedi_fops.c
Original file line number Diff line number Diff line change
Expand Up @@ -736,7 +736,8 @@ static int check_insn_config_length(struct comedi_insn *insn,
/* by default we allow the insn since we don't have checks for
* all possible cases yet */
default:
printk("comedi: no check for data length of config insn id "
printk(KERN_WARNING
"comedi: no check for data length of config insn id "
"%i is implemented.\n"
" Add a check to %s in %s.\n"
" Assuming n=%i is correct.\n", data[0], __func__,
Expand Down Expand Up @@ -1925,7 +1926,7 @@ static int __init comedi_init(void)
}
comedi_class = class_create(THIS_MODULE, "comedi");
if (IS_ERR(comedi_class)) {
printk("comedi: failed to create class");
printk(KERN_ERR "comedi: failed to create class");
cdev_del(&comedi_cdev);
unregister_chrdev_region(MKDEV(COMEDI_MAJOR, 0),
COMEDI_NUM_MINORS);
Expand Down Expand Up @@ -1971,7 +1972,8 @@ module_exit(comedi_cleanup);

void comedi_error(const struct comedi_device *dev, const char *s)
{
printk("comedi%d: %s: %s\n", dev->minor, dev->driver->driver_name, s);
printk(KERN_ERR "comedi%d: %s: %s\n", dev->minor,
dev->driver->driver_name, s);
}

void comedi_event(struct comedi_device *dev, struct comedi_subdevice *s)
Expand Down

0 comments on commit 931324f

Please sign in to comment.