Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 281105
b: refs/heads/master
c: e75aca9
h: refs/heads/master
i:
  281103: 73b0df8
v: v3
  • Loading branch information
Ravishankar karkala Mallikarjunayya authored and Greg Kroah-Hartman committed Nov 27, 2011
1 parent 2b47a41 commit 21dcc7d
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 13 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: bb1defe4653567f7754af741e20a79796a81beaa
refs/heads/master: e75aca92867eb687f6a2e0663db124f3fe3b4f1c
24 changes: 12 additions & 12 deletions trunk/drivers/staging/comedi/drivers/das800.c
Original file line number Diff line number Diff line change
Expand Up @@ -296,47 +296,47 @@ static int das800_probe(struct comedi_device *dev)
switch (id_bits) {
case 0x0:
if (board == das800) {
printk(" Board model: DAS-800\n");
dev_dbg(dev->hw_dev, "Board model: DAS-800\n");
return board;
}
if (board == ciodas800) {
printk(" Board model: CIO-DAS800\n");
dev_dbg(dev->hw_dev, "Board model: CIO-DAS800\n");
return board;
}
printk(" Board model (probed): DAS-800\n");
dev_dbg(dev->hw_dev, "Board model (probed): DAS-800\n");
return das800;
break;
case 0x2:
if (board == das801) {
printk(" Board model: DAS-801\n");
dev_dbg(dev->hw_dev, "Board model: DAS-801\n");
return board;
}
if (board == ciodas801) {
printk(" Board model: CIO-DAS801\n");
dev_dbg(dev->hw_dev, "Board model: CIO-DAS801\n");
return board;
}
printk(" Board model (probed): DAS-801\n");
dev_dbg(dev->hw_dev, "Board model (probed): DAS-801\n");
return das801;
break;
case 0x3:
if (board == das802) {
printk(" Board model: DAS-802\n");
dev_dbg(dev->hw_dev, "Board model: DAS-802\n");
return board;
}
if (board == ciodas802) {
printk(" Board model: CIO-DAS802\n");
dev_dbg(dev->hw_dev, "Board model: CIO-DAS802\n");
return board;
}
if (board == ciodas80216) {
printk(" Board model: CIO-DAS802/16\n");
dev_dbg(dev->hw_dev, "Board model: CIO-DAS802/16\n");
return board;
}
printk(" Board model (probed): DAS-802\n");
dev_dbg(dev->hw_dev, "Board model (probed): DAS-802\n");
return das802;
break;
default:
printk(" Board model: probe returned 0x%x (unknown)\n",
id_bits);
dev_dbg(dev->hw_dev, "Board model: probe returned 0x%x (unknown)\n",
id_bits);
return board;
break;
}
Expand Down

0 comments on commit 21dcc7d

Please sign in to comment.