Commit 08377263 authored by Geoffrey D. Bennett's avatar Geoffrey D. Bennett Committed by Greg Kroah-Hartman
Browse files

USB: usbfs: remove double evaluation of usb_sndctrlpipe() 



usb_sndctrlpipe() is evaluated in do_proc_control(), saved in a
variable, then evaluated again. Use the saved variable instead, to
match the use of usb_rcvctrlpipe().

Acked-by: default avatarAlan Stern <stern@rowland.harvard.edu>
Signed-off-by: default avatarGeoffrey D. Bennett <g@b4.vu>
Link: https://lore.kernel.org/r/20210521174027.GA116484@m.b4.vu


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 1eef7953

drivers/usb/core/devio.c

+1 −1
Original line number Diff line number Diff line
@@ -1162,7 +1162,7 @@ static int do_proc_control(struct usb_dev_state *ps, 
			tbuf, ctrl->wLength);



		usb_unlock_device(dev);

		i = usb_control_msg(dev, usb_sndctrlpipe(dev, 0), ctrl->bRequest,

		i = usb_control_msg(dev, pipe, ctrl->bRequest,

				    ctrl->bRequestType, ctrl->wValue, ctrl->wIndex,

				    tbuf, ctrl->wLength, tmo);

		usb_lock_device(dev);