Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 281107
b: refs/heads/master
c: 61a8d95
h: refs/heads/master
i:
  281105: 21dcc7d
  281103: 73b0df8
v: v3
  • Loading branch information
Ravishankar karkala Mallikarjunayya authored and Greg Kroah-Hartman committed Nov 27, 2011
1 parent 48a7d48 commit 1519167
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: f15d651b1499cf2798a508fc7ea42f3e3181be7f
refs/heads/master: 61a8d9550e620ab777ce25c2878e57f4e1a6acd3
8 changes: 3 additions & 5 deletions trunk/drivers/staging/comedi/drivers/das08_cs.c
Original file line number Diff line number Diff line change
Expand Up @@ -79,22 +79,20 @@ static int das08_cs_attach(struct comedi_device *dev,
if (ret < 0)
return ret;

printk("comedi%d: das08_cs: ", dev->minor);
dev_info(dev->hw_dev, "comedi%d: das08_cs:\n", dev->minor);
/* deal with a pci board */

if (thisboard->bustype == pcmcia) {
if (link == NULL) {
printk(" no pcmcia cards found\n");
dev_err(dev->hw_dev, "no pcmcia cards found\n");
return -EIO;
}
iobase = link->resource[0]->start;
} else {
printk(" bug! board does not have PCMCIA bustype\n");
dev_err(dev->hw_dev, "bug! board does not have PCMCIA bustype\n");
return -EINVAL;
}

printk("\n");

return das08_common_attach(dev, iobase);
}

Expand Down

0 comments on commit 1519167

Please sign in to comment.