Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f864b60a authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

USB: input: usbtouchscreen.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: default avatarDmitry 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: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 1b5ca928

drivers/input/touchscreen/usbtouchscreen.c

+2 −2
Original line number Diff line number Diff line
@@ -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);

}
@@ -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;