mirror of https://gitee.com/openkylin/linux.git
usb: wusbcore: preserve endianness of cached descriptors
Do not overwrite the multi-byte fields of usb_wa_descriptor with their cpu format values after reading the descriptor. Leave the values as __le16 and swap on use. This is more consistent with other uses of USB descriptors. Signed-off-by: Thomas Pugliese <thomas.pugliese@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
parent
679ee475a1
commit
1653d2f88f
|
@ -570,14 +570,10 @@ static int wa_fill_descr(struct wahc *wa)
|
|||
goto error;
|
||||
}
|
||||
wa->wa_descr = wa_descr = (struct usb_wa_descriptor *) hdr;
|
||||
/* Make LE fields CPU order */
|
||||
wa_descr->bcdWAVersion = le16_to_cpu(wa_descr->bcdWAVersion);
|
||||
wa_descr->wNumRPipes = le16_to_cpu(wa_descr->wNumRPipes);
|
||||
wa_descr->wRPipeMaxBlock = le16_to_cpu(wa_descr->wRPipeMaxBlock);
|
||||
if (wa_descr->bcdWAVersion > 0x0100)
|
||||
if (le16_to_cpu(wa_descr->bcdWAVersion) > 0x0100)
|
||||
dev_warn(dev, "Wire Adapter v%d.%d newer than groked v1.0\n",
|
||||
wa_descr->bcdWAVersion & 0xff00 >> 8,
|
||||
wa_descr->bcdWAVersion & 0x00ff);
|
||||
le16_to_cpu(wa_descr->bcdWAVersion) & 0xff00 >> 8,
|
||||
le16_to_cpu(wa_descr->bcdWAVersion) & 0x00ff);
|
||||
result = 0;
|
||||
error:
|
||||
return result;
|
||||
|
|
|
@ -480,7 +480,7 @@ int rpipe_get_by_ep(struct wahc *wa, struct usb_host_endpoint *ep,
|
|||
*/
|
||||
int wa_rpipes_create(struct wahc *wa)
|
||||
{
|
||||
wa->rpipes = wa->wa_descr->wNumRPipes;
|
||||
wa->rpipes = le16_to_cpu(wa->wa_descr->wNumRPipes);
|
||||
wa->rpipe_bm = kzalloc(BITS_TO_LONGS(wa->rpipes)*sizeof(unsigned long),
|
||||
GFP_KERNEL);
|
||||
if (wa->rpipe_bm == NULL)
|
||||
|
|
|
@ -279,11 +279,11 @@ struct wa_xfer_result {
|
|||
struct usb_wa_descriptor {
|
||||
u8 bLength;
|
||||
u8 bDescriptorType;
|
||||
u16 bcdWAVersion;
|
||||
__le16 bcdWAVersion;
|
||||
u8 bNumPorts; /* don't use!! */
|
||||
u8 bmAttributes; /* Reserved == 0 */
|
||||
u16 wNumRPipes;
|
||||
u16 wRPipeMaxBlock;
|
||||
__le16 wNumRPipes;
|
||||
__le16 wRPipeMaxBlock;
|
||||
u8 bRPipeBlockSize;
|
||||
u8 bPwrOn2PwrGood;
|
||||
u8 bNumMMCIEs;
|
||||
|
|
Loading…
Reference in New Issue