evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

USB: input: usbtouchscreen.c: fix up dev_err() usage

Browse source 
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>
This commit is contained in:
Greg Kroah-Hartman 2012-05-01 20:57:11 -04:00
parent 1b5ca928e7
commit f864b60ad0
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
drivers/input/touchscreen/usbtouchscreen.c
View file

@ -1380,7 +1380,7 @@ exit:
usb_mark_last_busy(interface_to_usbdev(usbtouch->interface)); usb_mark_last_busy(interface_to_usbdev(usbtouch->interface));
retval = usb_submit_urb(urb, GFP_ATOMIC); retval = usb_submit_urb(urb, GFP_ATOMIC);
if (retval) if (retval)
dev_err(&usbtouch->interface->dev, dev_err(&usbtouch->input->dev,
"%s - usb_submit_urb failed with result: %d\n", "%s - usb_submit_urb failed with result: %d\n",
__func__, retval); __func__, retval);
} }
@ -1623,7 +1623,7 @@ static int usbtouch_probe(struct usb_interface *intf,
err = usb_submit_urb(usbtouch->irq, GFP_KERNEL); err = usb_submit_urb(usbtouch->irq, GFP_KERNEL);
if (err) { if (err) {
usb_autopm_put_interface(intf); usb_autopm_put_interface(intf);
dev_err(&intf->dev, dev_err(&input_dev->dev,
"%s - usb_submit_urb failed with result: %d\n", "%s - usb_submit_urb failed with result: %d\n",
__func__, err); __func__, err);
goto out_unregister_input; goto out_unregister_input;