Commit 257adc0f authored by Alan Stern's avatar Alan Stern Committed by Greg Kroah-Hartman

USB: core: Fix compiler warnings in devio.c

In the current kernel, devio.c generates a number of compiler warnings
about taking the address of a member of a packed structure.  The
warnings all look like this one:

	drivers/usb/core/devio.c: In function ‘proc_do_submiturb’:
	drivers/usb/core/devio.c:1489:43: warning: taking address of packed member of ‘struct usb_ctrlrequest’ may result in an unaligned pointer value [-Waddress-of-packed-member]
	 1489 |   if (uurb->buffer_length < (le16_to_cpup(&dr->wLength) + 8)) {
	      |                                           ^~~~~~~~~~~~

These warnings can easily be eliminated by changing various
le16_to_cpup() calls to use le16_to_cpu() instead.
Signed-off-by: default avatarAlan Stern <stern@rowland.harvard.edu>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent ffed6097
...@@ -1510,15 +1510,15 @@ static int proc_do_submiturb(struct usb_dev_state *ps, struct usbdevfs_urb *uurb ...@@ -1510,15 +1510,15 @@ static int proc_do_submiturb(struct usb_dev_state *ps, struct usbdevfs_urb *uurb
ret = -EFAULT; ret = -EFAULT;
goto error; goto error;
} }
if (uurb->buffer_length < (le16_to_cpup(&dr->wLength) + 8)) { if (uurb->buffer_length < (le16_to_cpu(dr->wLength) + 8)) {
ret = -EINVAL; ret = -EINVAL;
goto error; goto error;
} }
ret = check_ctrlrecip(ps, dr->bRequestType, dr->bRequest, ret = check_ctrlrecip(ps, dr->bRequestType, dr->bRequest,
le16_to_cpup(&dr->wIndex)); le16_to_cpu(dr->wIndex));
if (ret) if (ret)
goto error; goto error;
uurb->buffer_length = le16_to_cpup(&dr->wLength); uurb->buffer_length = le16_to_cpu(dr->wLength);
uurb->buffer += 8; uurb->buffer += 8;
if ((dr->bRequestType & USB_DIR_IN) && uurb->buffer_length) { if ((dr->bRequestType & USB_DIR_IN) && uurb->buffer_length) {
is_in = 1; is_in = 1;
...@@ -1533,9 +1533,9 @@ static int proc_do_submiturb(struct usb_dev_state *ps, struct usbdevfs_urb *uurb ...@@ -1533,9 +1533,9 @@ static int proc_do_submiturb(struct usb_dev_state *ps, struct usbdevfs_urb *uurb
"bRequest=%02x wValue=%04x " "bRequest=%02x wValue=%04x "
"wIndex=%04x wLength=%04x\n", "wIndex=%04x wLength=%04x\n",
dr->bRequestType, dr->bRequest, dr->bRequestType, dr->bRequest,
__le16_to_cpup(&dr->wValue), __le16_to_cpu(dr->wValue),
__le16_to_cpup(&dr->wIndex), __le16_to_cpu(dr->wIndex),
__le16_to_cpup(&dr->wLength)); __le16_to_cpu(dr->wLength));
u = sizeof(struct usb_ctrlrequest); u = sizeof(struct usb_ctrlrequest);
break; break;
......
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