xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge tag 'v3.19-rc5' into next

Browse Source 
Linux 3.19-rc5

Conflicts:
	drivers/usb/dwc2/gadget.c
	drivers/usb/gadget/udc/bdc/bdc_ep.c
This commit is contained in:
Felipe Balbi
2015-01-19 09:57:20 -06:00
parent fe198e34a4 ec6f34e5b5
commit d1fc4440d7
263 changed files with 2404 additions and 1119 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/usb/dwc2/gadget.c
View File

@@ -2602,7 +2602,7 @@ error:
* s3c_hsotg_ep_disable - disable given endpoint
* @ep: The endpoint to disable.
*/
static int s3c_hsotg_ep_disable(struct usb_ep *ep)
static int s3c_hsotg_ep_disable_force(struct usb_ep *ep, bool force)
{
struct s3c_hsotg_ep *hs_ep = our_ep(ep);
struct dwc2_hsotg *hsotg = hs_ep->parent;
@@ -2645,6 +2645,10 @@ static int s3c_hsotg_ep_disable(struct usb_ep *ep)
return 0;
}
static int s3c_hsotg_ep_disable(struct usb_ep *ep)
{
return s3c_hsotg_ep_disable_force(ep, false);
}
/**
* on_list - check request is on the given endpoint
* @ep: The endpoint to check.