From 77da69df590fdd4454d8e8bafa9775976f6b0b72 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Tue, 1 May 2012 20:56:46 -0400 Subject: [PATCH] --- yaml --- r: 303673 b: refs/heads/master c: aa330384a6444682126de5dd49982fa428badd08 h: refs/heads/master i: 303671: a9eaa66428a62c532024e94a1fc7735468fd4e77 v: v3 --- [refs] | 2 +- trunk/drivers/input/misc/yealink.c | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index 34ab8be13128..a0ee334943fe 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 6b37dbba5d5f4e167eb5ca57e43c1bd49a696831 +refs/heads/master: aa330384a6444682126de5dd49982fa428badd08 diff --git a/trunk/drivers/input/misc/yealink.c b/trunk/drivers/input/misc/yealink.c index 4984823b3681..9f71bb174eed 100644 --- a/trunk/drivers/input/misc/yealink.c +++ b/trunk/drivers/input/misc/yealink.c @@ -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) { @@ -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); } @@ -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); } @@ -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) { @@ -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); }