Skip to content

Commit

Permalink
USB: input: usbtouchscreen.c: fix up dev_err() usage
Browse files Browse the repository at this point in the history
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: Henrik Rydberg <rydberg@euromail.se>
CC: Rusty Russell <rusty@rustcorp.com.au>
CC: Viresh Kumar <viresh.kumar@st.com>
CC: Armando Visconti <armando.visconti@st.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  • Loading branch information
Greg Kroah-Hartman committed May 2, 2012
1 parent 1b5ca92 commit f864b60
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions drivers/input/touchscreen/usbtouchscreen.c
Original file line number Diff line number Diff line change
Expand Up @@ -1380,7 +1380,7 @@ static void usbtouch_irq(struct urb *urb)
usb_mark_last_busy(interface_to_usbdev(usbtouch->interface));
retval = usb_submit_urb(urb, GFP_ATOMIC);
if (retval)
dev_err(&usbtouch->interface->dev,
dev_err(&usbtouch->input->dev,
"%s - usb_submit_urb failed with result: %d\n",
__func__, retval);
}
Expand Down Expand Up @@ -1623,7 +1623,7 @@ static int usbtouch_probe(struct usb_interface *intf,
err = usb_submit_urb(usbtouch->irq, GFP_KERNEL);
if (err) {
usb_autopm_put_interface(intf);
dev_err(&intf->dev,
dev_err(&input_dev->dev,
"%s - usb_submit_urb failed with result: %d\n",
__func__, err);
goto out_unregister_input;
Expand Down

0 comments on commit f864b60

Please sign in to comment.