Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 303673
b: refs/heads/master
c: aa33038
h: refs/heads/master
i:
  303671: a9eaa66
v: v3
  • Loading branch information
Greg Kroah-Hartman committed May 2, 2012
1 parent 804745b commit 77da69d
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 6 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: 6b37dbba5d5f4e167eb5ca57e43c1bd49a696831
refs/heads/master: aa330384a6444682126de5dd49982fa428badd08
10 changes: 5 additions & 5 deletions trunk/drivers/input/misc/yealink.c
Original file line number Diff line number Diff line change
Expand Up @@ -428,7 +428,7 @@ static void urb_irq_callback(struct urb *urb)
int ret, status = urb->status;

if (status)
dev_err(&yld->udev->dev, "%s - urb status %d\n",
dev_err(&yld->idev->dev, "%s - urb status %d\n",
__func__, status);

switch (yld->irq_data->cmd) {
Expand All @@ -444,7 +444,7 @@ static void urb_irq_callback(struct urb *urb)
break;

default:
dev_err(&yld->udev->dev, "unexpected response %x\n",
dev_err(&yld->idev->dev, "unexpected response %x\n",
yld->irq_data->cmd);
}

Expand All @@ -453,7 +453,7 @@ static void urb_irq_callback(struct urb *urb)
if (!yld->shutdown) {
ret = usb_submit_urb(yld->urb_ctl, GFP_ATOMIC);
if (ret && ret != -EPERM)
dev_err(&yld->udev->dev,
dev_err(&yld->idev->dev,
"%s - usb_submit_urb failed %d\n",
__func__, ret);
}
Expand All @@ -465,7 +465,7 @@ static void urb_ctl_callback(struct urb *urb)
int ret = 0, status = urb->status;

if (status)
dev_err(&yld->udev->dev, "%s - urb status %d\n",
dev_err(&yld->idev->dev, "%s - urb status %d\n",
__func__, status);

switch (yld->ctl_data->cmd) {
Expand All @@ -484,7 +484,7 @@ static void urb_ctl_callback(struct urb *urb)
}

if (ret && ret != -EPERM)
dev_err(&yld->udev->dev, "%s - usb_submit_urb failed %d\n",
dev_err(&yld->idev->dev, "%s - usb_submit_urb failed %d\n",
__func__, ret);
}

Expand Down

0 comments on commit 77da69d

Please sign in to comment.