Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e102609f authored by Laurent Pinchart's avatar Laurent Pinchart Committed by Felipe Balbi
Browse files

usb: gadget: uvc: Fix endianness mismatches 



The struct usb_endpoint_descriptor wMaxPacketSize field the struct
usb_ss_ep_comp_descriptor wBytesPerInterval field are stored in
little-endian format. Convert the values from CPU order to little endian
before storing the values.

Signed-off-by: default avatarLaurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: default avatarFelipe Balbi <balbi@ti.com>
parent 4a6698b8

drivers/usb/gadget/function/f_uvc.c

+6 −5
Original line number Diff line number Diff line
@@ -596,19 +596,20 @@ uvc_function_bind(struct usb_configuration *c, struct usb_function *f) 
	}



	uvc_fs_streaming_ep.wMaxPacketSize =

		min(opts->streaming_maxpacket, 1023U);

		cpu_to_le16(min(opts->streaming_maxpacket, 1023U));

	uvc_fs_streaming_ep.bInterval = opts->streaming_interval;



	uvc_hs_streaming_ep.wMaxPacketSize = max_packet_size;

	uvc_hs_streaming_ep.wMaxPacketSize |= ((max_packet_mult - 1) << 11);

	uvc_hs_streaming_ep.wMaxPacketSize =

		cpu_to_le16(max_packet_size | ((max_packet_mult - 1) << 11));

	uvc_hs_streaming_ep.bInterval = opts->streaming_interval;



	uvc_ss_streaming_ep.wMaxPacketSize = max_packet_size;

	uvc_ss_streaming_ep.wMaxPacketSize = cpu_to_le16(max_packet_size);

	uvc_ss_streaming_ep.bInterval = opts->streaming_interval;

	uvc_ss_streaming_comp.bmAttributes = max_packet_mult - 1;

	uvc_ss_streaming_comp.bMaxBurst = opts->streaming_maxburst;

	uvc_ss_streaming_comp.wBytesPerInterval =

		max_packet_size * max_packet_mult * opts->streaming_maxburst;

		cpu_to_le16(max_packet_size * max_packet_mult *

			    opts->streaming_maxburst);



	/* Allocate endpoints. */

	ep = usb_ep_autoconfig(cdev->gadget, &uvc_control_ep);