diff options
| author | Johan Hovold <johan@kernel.org> | 2020-01-22 13:15:27 +0300 |
|---|---|---|
| committer | Johan Hovold <johan@kernel.org> | 2020-01-23 11:11:16 +0300 |
| commit | 17a0184ca17e288decdca8b2841531e34d49285f (patch) | |
| tree | 6961885e31ffd475a9f1f52bc8d387c4e4569d84 /include/linux/usb/irda.h | |
| parent | 2988a8ae7476fe9535ab620320790d1714bdad1d (diff) | |
| download | linux-17a0184ca17e288decdca8b2841531e34d49285f.tar.xz | |
USB: serial: ir-usb: fix link-speed handling
Commit e0d795e4f36c ("usb: irda: cleanup on ir-usb module") added a USB
IrDA header with common defines, but mistakingly switched to using the
class-descriptor baud-rate bitmask values for the outbound header.
This broke link-speed handling for rates above 9600 baud, but a device
would also be able to operate at the default 9600 baud until a
link-speed request was issued (e.g. using the TCGETS ioctl).
Fixes: e0d795e4f36c ("usb: irda: cleanup on ir-usb module")
Cc: stable <stable@vger.kernel.org> # 2.6.27
Cc: Felipe Balbi <balbi@kernel.org>
Reviewed-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Johan Hovold <johan@kernel.org>
Diffstat (limited to 'include/linux/usb/irda.h')
| -rw-r--r-- | include/linux/usb/irda.h | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/include/linux/usb/irda.h b/include/linux/usb/irda.h index 396d2b043e64..556a801efce3 100644 --- a/include/linux/usb/irda.h +++ b/include/linux/usb/irda.h @@ -119,11 +119,22 @@ struct usb_irda_cs_descriptor { * 6 - 115200 bps * 7 - 576000 bps * 8 - 1.152 Mbps - * 9 - 5 mbps + * 9 - 4 Mbps * 10..15 - Reserved */ #define USB_IRDA_STATUS_LINK_SPEED 0x0f +#define USB_IRDA_LS_NO_CHANGE 0 +#define USB_IRDA_LS_2400 1 +#define USB_IRDA_LS_9600 2 +#define USB_IRDA_LS_19200 3 +#define USB_IRDA_LS_38400 4 +#define USB_IRDA_LS_57600 5 +#define USB_IRDA_LS_115200 6 +#define USB_IRDA_LS_576000 7 +#define USB_IRDA_LS_1152000 8 +#define USB_IRDA_LS_4000000 9 + /* The following is a 4-bit value used only for * outbound header: * |