Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 196975
b: refs/heads/master
c: 8487d0e
h: refs/heads/master
i:
  196973: d4ed4c5
  196971: a864e7b
  196967: 3333707
  196959: 583721e
v: v3
  • Loading branch information
Stephen Palmateer authored and Greg Kroah-Hartman committed May 11, 2010
1 parent 32aa747 commit c31bb49
Show file tree
Hide file tree
Showing 2 changed files with 6 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: 1bf2ee4ea19d3ebeb8fe35c03dd44cb1d851e19f
refs/heads/master: 8487d0e93a24de43c847b923f7bbbd9097e59d47
10 changes: 5 additions & 5 deletions trunk/drivers/staging/comedi/drivers/comedi_parport.c
Original file line number Diff line number Diff line change
Expand Up @@ -309,18 +309,18 @@ static int parport_attach(struct comedi_device *dev,
iobase = it->options[0];
printk(KERN_INFO "comedi%d: parport: 0x%04lx ", dev->minor, iobase);
if (!request_region(iobase, PARPORT_SIZE, "parport (comedi)")) {
printk("I/O port conflict\n");
printk(KERN_ERR "I/O port conflict\n");
return -EIO;
}
dev->iobase = iobase;

irq = it->options[1];
if (irq) {
printk(" irq=%u", irq);
printk(KERN_INFO " irq=%u", irq);
ret = request_irq(irq, parport_interrupt, 0, "comedi_parport",
dev);
if (ret < 0) {
printk(" irq not available\n");
printk(KERN_ERR " irq not available\n");
return -EINVAL;
}
dev->irq = irq;
Expand Down Expand Up @@ -380,13 +380,13 @@ static int parport_attach(struct comedi_device *dev,
devpriv->c_data = 0;
outb(devpriv->c_data, dev->iobase + PARPORT_C);

printk("\n");
printk(KERN_INFO "\n");
return 1;
}

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

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

0 comments on commit c31bb49

Please sign in to comment.