Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 281376
b: refs/heads/master
c: e2499d5
h: refs/heads/master
v: v3
  • Loading branch information
Ravishankar karkala Mallikarjunayya authored and Greg Kroah-Hartman committed Dec 14, 2011
1 parent d537fd4 commit 0c0ee2f
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 5 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: 904c02968b4c714e5fb6e750e746d8eceb641dd9
refs/heads/master: e2499d5c0d8571d9ac756bd8438b5f25fbaf132d
9 changes: 5 additions & 4 deletions trunk/drivers/staging/comedi/drivers/daqboard2000.c
Original file line number Diff line number Diff line change
Expand Up @@ -574,14 +574,14 @@ static int initialize_daqboard2000(struct comedi_device *dev,
secr = readl(devpriv->plx + 0x6c);
if (!(secr & DAQBOARD2000_EEPROM_PRESENT)) {
#ifdef DEBUG_EEPROM
printk("no serial eeprom\n");
dev_dbg(dev->hw_dev, "no serial eeprom\n");
#endif
return -EIO;
}

for (retry = 0; retry < 3; retry++) {
#ifdef DEBUG_EEPROM
printk("Programming EEPROM try %x\n", retry);
dev_dbg(dev->hw_dev, "Programming EEPROM try %x\n", retry);
#endif

daqboard2000_resetLocalBus(dev);
Expand All @@ -592,7 +592,8 @@ static int initialize_daqboard2000(struct comedi_device *dev,
if (cpld_array[i] == 0xff
&& cpld_array[i + 1] == 0x20) {
#ifdef DEBUG_EEPROM
printk("Preamble found at %d\n", i);
dev_dbg(dev->hw_dev, "Preamble found at %d\n",
i);
#endif
break;
}
Expand All @@ -605,7 +606,7 @@ static int initialize_daqboard2000(struct comedi_device *dev,
}
if (i >= len) {
#ifdef DEBUG_EEPROM
printk("Programmed\n");
dev_dbg(dev->hw_dev, "Programmed\n");
#endif
daqboard2000_resetLocalBus(dev);
daqboard2000_reloadPLX(dev);
Expand Down

0 comments on commit 0c0ee2f

Please sign in to comment.