A-Team_Digital_Solutions/android_kernel_motorola_sm6375
Watch
2
0
Fork
You've already forked android_kernel_motorola_sm6375
 0
mirror of https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git synced 2026-10-08 12:58:12 -04:00
Code Issues Projects Releases Packages Wiki Activity

Merge "usb: gadget: f_qdss: Fix compilation errors"

Browse source
This commit is contained in:
qctecmdr 2019-11-07 12:29:36 -08:00 • committed by Gerrit - the friendly Code Review server
commit 3f4e0223ae
3 changed files with 10 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

6
drivers/usb/gadget/function/f_qdss.c
View file

@ -539,7 +539,6 @@ static void qdss_eps_disable(struct usb_function *f)
if (qdss->data_enabled) {
usb_ep_disable(qdss->port.data);
qdss->port.data->endless = false;
qdss->data_enabled = 0;
}
}
@ -681,12 +680,9 @@ static int qdss_set_alt(struct usb_function *f, unsigned int intf,
goto fail;
}
qdss->port.data->endless = true;
ret = usb_ep_enable(qdss->port.data);
if (ret) {
qdss->port.data->endless = false;
if (ret)
goto fail;
}
qdss->port.data->driver_data = qdss;
qdss->data_enabled = 1;

11
drivers/usb/gadget/function/u_qdss.c
View file

@ -7,13 +7,13 @@
#include <linux/device.h>
#include <linux/usb_bam.h>
#include <linux/dma-mapping.h>
#include <linux/usb/dwc3-msm.h>
#include "f_qdss.h"
static int alloc_sps_req(struct usb_ep *data_ep)
{
struct usb_request *req = NULL;
struct f_qdss *qdss = data_ep->driver_data;
u32 sps_params = 0;
pr_debug("send_sps_req\n");
@ -24,9 +24,6 @@ static int alloc_sps_req(struct usb_ep *data_ep)
}
req->length = 32*1024;
sps_params = MSM_SPS_MODE | MSM_DISABLE_WB |
qdss->bam_info.usb_bam_pipe_idx;
req->udc_priv = sps_params;
qdss->endless_req = req;
return 0;
@ -125,10 +122,14 @@ static int init_data(struct usb_ep *ep)
{
struct f_qdss *qdss = ep->driver_data;
int res = 0;
u32 sps_params = 0;
pr_debug("%s\n", __func__);
res = msm_ep_config(ep, qdss->endless_req);
sps_params = MSM_SPS_MODE | MSM_DISABLE_WB |
qdss->bam_info.usb_bam_pipe_idx;
res = msm_ep_config(ep, qdss->endless_req, sps_params);
if (res)
pr_err("msm_ep_config failed\n");

3
include/linux/usb/dwc3-msm.h
View file

@ -6,6 +6,9 @@
#ifndef __LINUX_USB_DWC3_MSM_H
#define __LINUX_USB_DWC3_MSM_H
#include <linux/scatterlist.h>
#include <linux/usb/gadget.h>
/* used for struct usb_phy flags */
#define ENABLE_DP_MANUAL_PULLUP BIT(0)
#define ENABLE_SECONDARY_PHY BIT(1)