forge/linux-uconsole
1
0
Fork 0
Code Issues 1 Pull requests Projects Releases Packages Wiki Activity Actions

Revert "usb: gadget: transfer_type depends on CONFIG_NO_GKI"

Browse source 
This reverts commit 866525fd9f.

Signed-off-by: William Wu <william.wu@rock-chips.com>
Change-Id: Iba893b9036a01bcdc981311a9846b2375e167c02
This commit is contained in:
William Wu 2023-01-29 20:30:23 +08:00 • committed by Tao Huang
commit da52789497
2 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

4
drivers/usb/gadget/epautoconf.c
View file

@ -67,7 +67,7 @@ struct usb_ep *usb_ep_autoconfig_ss(
)
{
struct usb_ep *ep;
#if defined(CONFIG_ARCH_ROCKCHIP) && defined(CONFIG_NO_GKI)
#ifdef CONFIG_ARCH_ROCKCHIP
u8 type = desc->bmAttributes & USB_ENDPOINT_XFERTYPE_MASK;
#endif
@ -113,7 +113,7 @@ found_ep:
ep->desc = NULL;
ep->comp_desc = NULL;
ep->claimed = true;
#if defined(CONFIG_ARCH_ROCKCHIP) && defined(CONFIG_NO_GKI)
#ifdef CONFIG_ARCH_ROCKCHIP
ep->transfer_type = type;
if (gadget_is_superspeed(gadget) && ep_comp) {
switch (type) {

2
include/linux/usb/gadget.h
View file

@ -246,7 +246,7 @@ struct usb_ep {
u8 address;
const struct usb_endpoint_descriptor *desc;
const struct usb_ss_ep_comp_descriptor *comp_desc;
#if defined(CONFIG_ARCH_ROCKCHIP) && defined(CONFIG_NO_GKI)
#ifdef CONFIG_ARCH_ROCKCHIP
u8 transfer_type;
#endif