Commit 6164f5e8 authored by Johan Hovold's avatar Johan Hovold Committed by Ben Hutchings

USB: serial: ir-usb: fix big-endian baud-rate debug printk

commit ad0ccac7 upstream.

Add missing endianness conversion when printing the supported baud
rates.

Found using sparse:

	warning: restricted __le16 degrades to integer

Fixes: e0d795e4 ("usb: irda: cleanup on ir-usb module")
Reviewed-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: default avatarJohan Hovold <johan@kernel.org>
[bwh: Backported to 3.2: adjust context]
Signed-off-by: default avatarBen Hutchings <ben@decadent.org.uk>
parent bb1fbed7
...@@ -236,6 +236,7 @@ static u8 ir_xbof_change(u8 xbof) ...@@ -236,6 +236,7 @@ static u8 ir_xbof_change(u8 xbof)
static int ir_startup(struct usb_serial *serial) static int ir_startup(struct usb_serial *serial)
{ {
struct usb_irda_cs_descriptor *irda_desc; struct usb_irda_cs_descriptor *irda_desc;
int rates;
irda_desc = irda_usb_find_class_desc(serial->dev, 0); irda_desc = irda_usb_find_class_desc(serial->dev, 0);
if (!irda_desc) { if (!irda_desc) {
...@@ -244,17 +245,19 @@ static int ir_startup(struct usb_serial *serial) ...@@ -244,17 +245,19 @@ static int ir_startup(struct usb_serial *serial)
return -ENODEV; return -ENODEV;
} }
rates = le16_to_cpu(irda_desc->wBaudRate);
dbg("%s - Baud rates supported:%s%s%s%s%s%s%s%s%s", dbg("%s - Baud rates supported:%s%s%s%s%s%s%s%s%s",
__func__, __func__,
(irda_desc->wBaudRate & USB_IRDA_BR_2400) ? " 2400" : "", (rates & USB_IRDA_BR_2400) ? " 2400" : "",
(irda_desc->wBaudRate & USB_IRDA_BR_9600) ? " 9600" : "", (rates & USB_IRDA_BR_9600) ? " 9600" : "",
(irda_desc->wBaudRate & USB_IRDA_BR_19200) ? " 19200" : "", (rates & USB_IRDA_BR_19200) ? " 19200" : "",
(irda_desc->wBaudRate & USB_IRDA_BR_38400) ? " 38400" : "", (rates & USB_IRDA_BR_38400) ? " 38400" : "",
(irda_desc->wBaudRate & USB_IRDA_BR_57600) ? " 57600" : "", (rates & USB_IRDA_BR_57600) ? " 57600" : "",
(irda_desc->wBaudRate & USB_IRDA_BR_115200) ? " 115200" : "", (rates & USB_IRDA_BR_115200) ? " 115200" : "",
(irda_desc->wBaudRate & USB_IRDA_BR_576000) ? " 576000" : "", (rates & USB_IRDA_BR_576000) ? " 576000" : "",
(irda_desc->wBaudRate & USB_IRDA_BR_1152000) ? " 1152000" : "", (rates & USB_IRDA_BR_1152000) ? " 1152000" : "",
(irda_desc->wBaudRate & USB_IRDA_BR_4000000) ? " 4000000" : ""); (rates & USB_IRDA_BR_4000000) ? " 4000000" : "");
switch (irda_desc->bmAdditionalBOFs) { switch (irda_desc->bmAdditionalBOFs) {
case USB_IRDA_AB_48: case USB_IRDA_AB_48:
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment