Commit 1a6e9a9c authored by Johan Hovold's avatar Johan Hovold Committed by David S. Miller
Browse files

net: hso: fix control-request directions 



The direction of the pipe argument must match the request-type direction
bit or control requests may fail depending on the host-controller-driver
implementation.

Fix the tiocmset and rfkill requests which erroneously used
usb_rcvctrlpipe().

Fixes: 72dc1c09 ("HSO: add option hso driver")
Cc: stable@vger.kernel.org      # 2.6.27
Signed-off-by: default avatarJohan Hovold <johan@kernel.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 1a44fb38

drivers/net/usb/hso.c

+2 −2
Original line number Diff line number Diff line
@@ -1689,7 +1689,7 @@ static int hso_serial_tiocmset(struct tty_struct *tty, 
	spin_unlock_irqrestore(&serial->serial_lock, flags);



	return usb_control_msg(serial->parent->usb,

			       usb_rcvctrlpipe(serial->parent->usb, 0), 0x22,

			       usb_sndctrlpipe(serial->parent->usb, 0), 0x22,

			       0x21, val, if_num, NULL, 0,

			       USB_CTRL_SET_TIMEOUT);

}
@@ -2436,7 +2436,7 @@ static int hso_rfkill_set_block(void *data, bool blocked) 
	if (hso_dev->usb_gone)

		rv = 0;

	else

		rv = usb_control_msg(hso_dev->usb, usb_rcvctrlpipe(hso_dev->usb, 0),

		rv = usb_control_msg(hso_dev->usb, usb_sndctrlpipe(hso_dev->usb, 0),

				       enabled ? 0x82 : 0x81, 0x40, 0, 0, NULL, 0,

				       USB_CTRL_SET_TIMEOUT);

	mutex_unlock(&hso_dev->mutex);