diff options
author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-05-01 20:57:07 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-05-01 20:57:07 -0400 |
commit | 1b5ca928e7d09c5ce0cefe6aec7392e4a3aa1d3b (patch) | |
tree | 16b91c3bfb20901ba511b65e61356f4335ee91ea /drivers/input/tablet/wacom_sys.c | |
parent | 3415b57cb3d7b6b6cd5fcbf5f3f64ca28a3f95e2 (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>
Diffstat (limited to 'drivers/input/tablet/wacom_sys.c')
-rw-r--r-- | drivers/input/tablet/wacom_sys.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/input/tablet/wacom_sys.c b/drivers/input/tablet/wacom_sys.c index 3db4684a0b77..821d2a958e44 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) | |||
122 | usb_mark_last_busy(wacom->usbdev); | 122 | usb_mark_last_busy(wacom->usbdev); |
123 | retval = usb_submit_urb(urb, GFP_ATOMIC); | 123 | retval = usb_submit_urb(urb, GFP_ATOMIC); |
124 | if (retval) | 124 | if (retval) |
125 | dev_err(&wacom->intf->dev, | 125 | dev_err(&wacom->wacom_wac.input->dev, |
126 | "%s - usb_submit_urb failed with result %d\n", | 126 | "%s - usb_submit_urb failed with result %d\n", |
127 | __func__, retval); | 127 | __func__, retval); |
128 | } | 128 | } |
@@ -818,7 +818,7 @@ static int wacom_initialize_leds(struct wacom *wacom) | |||
818 | } | 818 | } |
819 | 819 | ||
820 | if (error) { | 820 | if (error) { |
821 | dev_err(&wacom->intf->dev, | 821 | dev_err(&wacom->wacom_wac.input->dev, |
822 | "cannot create sysfs group err: %d\n", error); | 822 | "cannot create sysfs group err: %d\n", error); |
823 | return error; | 823 | return error; |
824 | } | 824 | } |