summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-05-01 20:57:07 -0400
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-05-01 20:57:07 -0400
commit1b5ca928e7d09c5ce0cefe6aec7392e4a3aa1d3b (patch)
tree16b91c3bfb20901ba511b65e61356f4335ee91ea
parent3415b57cb3d7b6b6cd5fcbf5f3f64ca28a3f95e2 (diff)
USB: input: wacom_sys.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: Ping Cheng <pingc@wacom.com> CC: Chris Bagwell <chris@cnpbagwell.com> CC: Eduard Hasenleithner <eduard@hasenleithner.at> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--drivers/input/tablet/wacom_sys.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/input/tablet/wacom_sys.c b/drivers/input/tablet/wacom_sys.c
index 3db4684a0b7..821d2a958e4 100644
--- a/drivers/input/tablet/wacom_sys.c
+++ b/drivers/input/tablet/wacom_sys.c
@@ -122,7 +122,7 @@ static void wacom_sys_irq(struct urb *urb)
usb_mark_last_busy(wacom->usbdev);
retval = usb_submit_urb(urb, GFP_ATOMIC);
if (retval)
- dev_err(&wacom->intf->dev,
+ dev_err(&wacom->wacom_wac.input->dev,
"%s - usb_submit_urb failed with result %d\n",
__func__, retval);
}
@@ -818,7 +818,7 @@ static int wacom_initialize_leds(struct wacom *wacom)
}
if (error) {
- dev_err(&wacom->intf->dev,
+ dev_err(&wacom->wacom_wac.input->dev,
"cannot create sysfs group err: %d\n", error);
return error;
}