Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 303687
b: refs/heads/master
c: 938476f
h: refs/heads/master
i:
  303685: 485141f
  303683: 4c044cd
  303679: ce25866
v: v3
  • Loading branch information
Greg Kroah-Hartman committed May 2, 2012
1 parent 93d8a2f commit 9929ceb
Show file tree
Hide file tree
Showing 2 changed files with 7 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: 8b0725c0593871106d24ed94e7a14cf2316cb21d
refs/heads/master: 938476f9237ee97480ddb091c06d67851bb4d7e9
10 changes: 6 additions & 4 deletions trunk/drivers/input/misc/yealink.c
Original file line number Diff line number Diff line change
Expand Up @@ -438,7 +438,8 @@ static void urb_irq_callback(struct urb *urb)
break;

case CMD_SCANCODE:
dbg("get scancode %x", yld->irq_data->data[0]);
dev_dbg(&yld->idev->dev, "get scancode %x\n",
yld->irq_data->data[0]);

report_key(yld, map_p1k_to_key(yld->irq_data->data[0]));
break;
Expand Down Expand Up @@ -517,7 +518,7 @@ static int input_open(struct input_dev *dev)
struct yealink_dev *yld = input_get_drvdata(dev);
int i, ret;

dbg("%s", __func__);
dev_dbg(&yld->idev->dev, "%s\n", __func__);

/* force updates to device */
for (i = 0; i<sizeof(yld->master); i++)
Expand All @@ -532,8 +533,9 @@ static int input_open(struct input_dev *dev)
yld->ctl_data->size = 10;
yld->ctl_data->sum = 0x100-CMD_INIT-10;
if ((ret = usb_submit_urb(yld->urb_ctl, GFP_KERNEL)) != 0) {
dbg("%s - usb_submit_urb failed with result %d",
__func__, ret);
dev_dbg(&yld->idev->dev,
"%s - usb_submit_urb failed with result %d\n",
__func__, ret);
return ret;
}
return 0;
Expand Down

0 comments on commit 9929ceb

Please sign in to comment.