tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

usb: gadget: regression fix - usage of usb_ep

This patch removes redundant pointer to struct usb_endpoint_descriptor which
were missed in commit 79149b8:

usb: gadget: Update fsl_udc_core to use usb_endpoint_descriptor inside the
struct usb_ep

Due to clock framework regressions, this patch is only compile tested!

Signed-off-by: Christoph Fritz <chf.fritz@googlemail.com>
Signed-off-by: Felipe Balbi <balbi@ti.com>

authored by

Christoph Fritz and committed by
Felipe Balbi 80e91fd5 109f0f71

+3 -3
+1 -1
drivers/usb/gadget/fsl_udc_core.c
··· 2575 2575 /* for ep0: the desc defined here; 2576 2576 * for other eps, gadget layer called ep_enable with defined desc 2577 2577 */ 2578 - udc_controller->eps[0].desc = &fsl_ep0_desc; 2578 + udc_controller->eps[0].ep.desc = &fsl_ep0_desc; 2579 2579 udc_controller->eps[0].ep.maxpacket = USB_MAX_CTRL_PAYLOAD; 2580 2580 2581 2581 /* setup the udc->eps[] for non-control endpoints and link
+2 -2
drivers/usb/gadget/fsl_usb2_udc.h
··· 568 568 /* 569 569 * ### internal used help routines. 570 570 */ 571 - #define ep_index(EP) ((EP)->desc->bEndpointAddress&0xF) 571 + #define ep_index(EP) ((EP)->ep.desc->bEndpointAddress&0xF) 572 572 #define ep_maxpacket(EP) ((EP)->ep.maxpacket) 573 573 #define ep_is_in(EP) ( (ep_index(EP) == 0) ? (EP->udc->ep0_dir == \ 574 - USB_DIR_IN ):((EP)->desc->bEndpointAddress \ 574 + USB_DIR_IN) : ((EP)->ep.desc->bEndpointAddress \ 575 575 & USB_DIR_IN)==USB_DIR_IN) 576 576 #define get_ep_by_pipe(udc, pipe) ((pipe == 1)? &udc->eps[0]: \ 577 577 &udc->eps[pipe])