Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 281378
b: refs/heads/master
c: 7a647b9
h: refs/heads/master
v: v3
  • Loading branch information
Ravishankar karkala Mallikarjunayya authored and Greg Kroah-Hartman committed Dec 14, 2011
1 parent 16986e6 commit 8de6bac
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 14 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: 1e3a2875684bcc4af1e2f6597fdd502cc59e3593
refs/heads/master: 7a647b9e4a583d514899b22c5e5fa3a849c8b2a0
27 changes: 14 additions & 13 deletions trunk/drivers/staging/comedi/drivers/das1800.c
Original file line number Diff line number Diff line change
Expand Up @@ -835,8 +835,8 @@ static int das1800_probe(struct comedi_device *dev)
case 0x3:
if (board == das1801st_da || board == das1802st_da ||
board == das1701st_da || board == das1702st_da) {
printk(" Board model: %s\n",
das1800_boards[board].name);
dev_dbg(dev->hw_dev, "Board model: %s\n",
das1800_boards[board].name);
return board;
}
printk
Expand All @@ -845,8 +845,8 @@ static int das1800_probe(struct comedi_device *dev)
break;
case 0x4:
if (board == das1802hr_da || board == das1702hr_da) {
printk(" Board model: %s\n",
das1800_boards[board].name);
dev_dbg(dev->hw_dev, "Board model: %s\n",
das1800_boards[board].name);
return board;
}
printk
Expand All @@ -856,8 +856,8 @@ static int das1800_probe(struct comedi_device *dev)
case 0x5:
if (board == das1801ao || board == das1802ao ||
board == das1701ao || board == das1702ao) {
printk(" Board model: %s\n",
das1800_boards[board].name);
dev_dbg(dev->hw_dev, "Board model: %s\n",
das1800_boards[board].name);
return board;
}
printk
Expand All @@ -866,18 +866,19 @@ static int das1800_probe(struct comedi_device *dev)
break;
case 0x6:
if (board == das1802hr || board == das1702hr) {
printk(" Board model: %s\n",
das1800_boards[board].name);
dev_dbg(dev->hw_dev, "Board model: %s\n",
das1800_boards[board].name);
return board;
}
printk(" Board model (probed, not recommended): das-1802hr\n");
printk
(" Board model (probed, not recommended): das-1802hr\n");
return das1802hr;
break;
case 0x7:
if (board == das1801st || board == das1802st ||
board == das1701st || board == das1702st) {
printk(" Board model: %s\n",
das1800_boards[board].name);
dev_dbg(dev->hw_dev, "Board model: %s\n",
das1800_boards[board].name);
return board;
}
printk
Expand All @@ -886,8 +887,8 @@ static int das1800_probe(struct comedi_device *dev)
break;
case 0x8:
if (board == das1801hc || board == das1802hc) {
printk(" Board model: %s\n",
das1800_boards[board].name);
dev_dbg(dev->hw_dev, "Board model: %s\n",
das1800_boards[board].name);
return board;
}
printk
Expand Down

0 comments on commit 8de6bac

Please sign in to comment.