Commit 5e8b6f42e861ec9e0ddbfb7c0cb30b1b7fa3b327
Committed by
Sekhar Nori
Sekhar Nori
1 parent
f38332b3a1
Exists in
smarc-ti-linux-3.14.y
and in
1 other branch
Revert "usb: dwc3: gadget: Mark freed EPs as NULL"
This reverts commit 2b0b0f27efd947d25e130702e8c34a7816076281. Signed-off-by: Roger Quadros <rogerq@ti.com> Signed-off-by: Sekhar Nori <nsekhar@ti.com>
Showing 1 changed file with 20 additions and 26 deletions Side-by-side Diff
drivers/usb/dwc3/gadget.c
| ... | ... | @@ -1856,7 +1856,6 @@ |
| 1856 | 1856 | } |
| 1857 | 1857 | |
| 1858 | 1858 | kfree(dep); |
| 1859 | - dwc->eps[epnum] = NULL; | |
| 1860 | 1859 | } |
| 1861 | 1860 | } |
| 1862 | 1861 | |
| ... | ... | @@ -2960,10 +2959,8 @@ |
| 2960 | 2959 | dwc->pullups_connected = true; |
| 2961 | 2960 | } |
| 2962 | 2961 | |
| 2963 | - if (dwc->eps[0] && dwc->eps[1]) { | |
| 2964 | - __dwc3_gadget_ep_disable(dwc->eps[0]); | |
| 2965 | - __dwc3_gadget_ep_disable(dwc->eps[1]); | |
| 2966 | - } | |
| 2962 | + __dwc3_gadget_ep_disable(dwc->eps[0]); | |
| 2963 | + __dwc3_gadget_ep_disable(dwc->eps[1]); | |
| 2967 | 2964 | |
| 2968 | 2965 | dwc->dcfg = dwc3_readl(dwc->regs, DWC3_DCFG); |
| 2969 | 2966 | |
| 2970 | 2967 | |
| 2971 | 2968 | |
| 2972 | 2969 | |
| 2973 | 2970 | |
| 2974 | 2971 | |
| 2975 | 2972 | |
| ... | ... | @@ -2975,33 +2972,30 @@ |
| 2975 | 2972 | struct dwc3_ep *dep; |
| 2976 | 2973 | int ret; |
| 2977 | 2974 | |
| 2978 | - if (dwc->eps[0] && dwc->eps[1]) { | |
| 2979 | - /* Start with SuperSpeed Default */ | |
| 2980 | - dwc3_gadget_ep0_desc.wMaxPacketSize = cpu_to_le16(512); | |
| 2975 | + /* Start with SuperSpeed Default */ | |
| 2976 | + dwc3_gadget_ep0_desc.wMaxPacketSize = cpu_to_le16(512); | |
| 2981 | 2977 | |
| 2982 | - dep = dwc->eps[0]; | |
| 2983 | - ret = __dwc3_gadget_ep_enable(dep, &dwc3_gadget_ep0_desc, | |
| 2984 | - NULL, false); | |
| 2985 | - if (ret) | |
| 2986 | - goto err0; | |
| 2978 | + dep = dwc->eps[0]; | |
| 2979 | + ret = __dwc3_gadget_ep_enable(dep, &dwc3_gadget_ep0_desc, NULL, false); | |
| 2980 | + if (ret) | |
| 2981 | + goto err0; | |
| 2987 | 2982 | |
| 2988 | - dep = dwc->eps[1]; | |
| 2989 | - ret = __dwc3_gadget_ep_enable(dep, &dwc3_gadget_ep0_desc, | |
| 2990 | - NULL, false); | |
| 2991 | - if (ret) | |
| 2992 | - goto err1; | |
| 2983 | + dep = dwc->eps[1]; | |
| 2984 | + ret = __dwc3_gadget_ep_enable(dep, &dwc3_gadget_ep0_desc, NULL, false); | |
| 2985 | + if (ret) | |
| 2986 | + goto err1; | |
| 2993 | 2987 | |
| 2994 | - /* begin to receive SETUP packets */ | |
| 2995 | - dwc->ep0state = EP0_SETUP_PHASE; | |
| 2996 | - dwc3_ep0_out_start(dwc); | |
| 2988 | + /* begin to receive SETUP packets */ | |
| 2989 | + dwc->ep0state = EP0_SETUP_PHASE; | |
| 2990 | + dwc3_ep0_out_start(dwc); | |
| 2997 | 2991 | |
| 2998 | - dwc3_writel(dwc->regs, DWC3_DCFG, dwc->dcfg); | |
| 2992 | + dwc3_writel(dwc->regs, DWC3_DCFG, dwc->dcfg); | |
| 2999 | 2993 | |
| 3000 | - if (dwc->pullups_connected) { | |
| 3001 | - dwc3_gadget_enable_irq(dwc); | |
| 3002 | - dwc3_gadget_run_stop(dwc, true, false); | |
| 3003 | - } | |
| 2994 | + if (dwc->pullups_connected) { | |
| 2995 | + dwc3_gadget_enable_irq(dwc); | |
| 2996 | + dwc3_gadget_run_stop(dwc, true, false); | |
| 3004 | 2997 | } |
| 2998 | + | |
| 3005 | 2999 | return 0; |
| 3006 | 3000 | |
| 3007 | 3001 | err1: |