Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 337214
b: refs/heads/master
c: 7194d0e
h: refs/heads/master
v: v3
  • Loading branch information
YAMANE Toshiaki authored and Greg Kroah-Hartman committed Oct 24, 2012
1 parent e448227 commit a93baa2
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 8 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: a17d23de9c5391e1651ae77d4e88d3c7bd55d1d6
refs/heads/master: 7194d0e107fa70ca46b2a03b27b8b7ad2266d8bf
13 changes: 6 additions & 7 deletions trunk/drivers/staging/comedi/drivers/vmk80xx.c
Original file line number Diff line number Diff line change
Expand Up @@ -1371,12 +1371,11 @@ static int vmk80xx_usb_probe(struct usb_interface *intf,

if (dev->board.model == VMK8061_MODEL) {
vmk80xx_read_eeprom(dev, IC3_VERSION);
printk(KERN_INFO "comedi#: vmk80xx: %s\n", dev->fw.ic3_vers);
dev_info(&intf->dev, "%s\n", dev->fw.ic3_vers);

if (vmk80xx_check_data_link(dev)) {
vmk80xx_read_eeprom(dev, IC6_VERSION);
printk(KERN_INFO "comedi#: vmk80xx: %s\n",
dev->fw.ic6_vers);
dev_info(&intf->dev, "%s\n", dev->fw.ic6_vers);
} else {
dbgcm("comedi#: vmk80xx: no conn. to CPU\n");
}
Expand All @@ -1387,8 +1386,8 @@ static int vmk80xx_usb_probe(struct usb_interface *intf,

dev->probed = 1;

printk(KERN_INFO "comedi#: vmk80xx: board #%d [%s] now attached\n",
dev->count, dev->board.name);
dev_info(&intf->dev, "board #%d [%s] now attached\n",
dev->count, dev->board.name);

mutex_unlock(&glb_mutex);

Expand Down Expand Up @@ -1422,8 +1421,8 @@ static void vmk80xx_usb_disconnect(struct usb_interface *intf)
kfree(dev->usb_rx_buf);
kfree(dev->usb_tx_buf);

printk(KERN_INFO "comedi#: vmk80xx: board #%d [%s] now detached\n",
dev->count, dev->board.name);
dev_info(&intf->dev, "board #%d [%s] now detached\n",
dev->count, dev->board.name);

up(&dev->limit_sem);
mutex_unlock(&glb_mutex);
Expand Down

0 comments on commit a93baa2

Please sign in to comment.