aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-05-01 20:56:46 -0400
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-05-01 20:56:46 -0400
commitaa330384a6444682126de5dd49982fa428badd08 (patch)
treefd294a4843e90bd768bd43db32707d0096d909ec
parent6b37dbba5d5f4e167eb5ca57e43c1bd49a696831 (diff)
USB: input: yealink.c: fix up dev_err() usage
We should always reference the input device for dev_err(), not the USB device. Fix up the places where I got this wrong. Reported-by: Dmitry Torokhov <dmitry.torokhov@gmail.com> CC: Henk Vergonet <Henk.Vergonet@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--drivers/input/misc/yealink.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/input/misc/yealink.c b/drivers/input/misc/yealink.c
index 4984823b3681..9f71bb174eed 100644
--- a/drivers/input/misc/yealink.c
+++ b/drivers/input/misc/yealink.c
@@ -428,7 +428,7 @@ static void urb_irq_callback(struct urb *urb)
428 int ret, status = urb->status; 428 int ret, status = urb->status;
429 429
430 if (status) 430 if (status)
431 dev_err(&yld->udev->dev, "%s - urb status %d\n", 431 dev_err(&yld->idev->dev, "%s - urb status %d\n",
432 __func__, status); 432 __func__, status);
433 433
434 switch (yld->irq_data->cmd) { 434 switch (yld->irq_data->cmd) {
@@ -444,7 +444,7 @@ static void urb_irq_callback(struct urb *urb)
444 break; 444 break;
445 445
446 default: 446 default:
447 dev_err(&yld->udev->dev, "unexpected response %x\n", 447 dev_err(&yld->idev->dev, "unexpected response %x\n",
448 yld->irq_data->cmd); 448 yld->irq_data->cmd);
449 } 449 }
450 450
@@ -453,7 +453,7 @@ static void urb_irq_callback(struct urb *urb)
453 if (!yld->shutdown) { 453 if (!yld->shutdown) {
454 ret = usb_submit_urb(yld->urb_ctl, GFP_ATOMIC); 454 ret = usb_submit_urb(yld->urb_ctl, GFP_ATOMIC);
455 if (ret && ret != -EPERM) 455 if (ret && ret != -EPERM)
456 dev_err(&yld->udev->dev, 456 dev_err(&yld->idev->dev,
457 "%s - usb_submit_urb failed %d\n", 457 "%s - usb_submit_urb failed %d\n",
458 __func__, ret); 458 __func__, ret);
459 } 459 }
@@ -465,7 +465,7 @@ static void urb_ctl_callback(struct urb *urb)
465 int ret = 0, status = urb->status; 465 int ret = 0, status = urb->status;
466 466
467 if (status) 467 if (status)
468 dev_err(&yld->udev->dev, "%s - urb status %d\n", 468 dev_err(&yld->idev->dev, "%s - urb status %d\n",
469 __func__, status); 469 __func__, status);
470 470
471 switch (yld->ctl_data->cmd) { 471 switch (yld->ctl_data->cmd) {
@@ -484,7 +484,7 @@ static void urb_ctl_callback(struct urb *urb)
484 } 484 }
485 485
486 if (ret && ret != -EPERM) 486 if (ret && ret != -EPERM)
487 dev_err(&yld->udev->dev, "%s - usb_submit_urb failed %d\n", 487 dev_err(&yld->idev->dev, "%s - usb_submit_urb failed %d\n",
488 __func__, ret); 488 __func__, ret);
489} 489}
490 490