Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit cb82632a authored by Kyle Yan's avatar Kyle Yan Committed by Gerrit - the friendly Code Review server
Browse files

Merge "usb: gadget: qdss: Fix compilation errors" into msm-4.9

parents 1b45f2a3 9f189e04

drivers/usb/gadget/function/f_qdss.c

+0 −1
Original line number Diff line number Diff line
@@ -18,7 +18,6 @@ 
#include <linux/kernel.h>

#include <linux/device.h>

#include <linux/usb/usb_qdss.h>

#include <linux/usb/msm_hsusb.h>

#include <linux/usb/cdc.h>



#include "f_qdss.h"

drivers/usb/gadget/function/f_qdss.h

+5 −2
Original line number Diff line number Diff line
@@ -17,11 +17,14 @@ 
#include <linux/kernel.h>

#include <linux/usb/ch9.h>

#include <linux/usb/gadget.h>

#include <linux/usb/msm_hsusb.h>

#include <linux/usb/composite.h>

#include <linux/usb/usb_qdss.h>



#include "u_rmnet.h"

enum qti_port_type {

	QTI_PORT_RMNET,

	QTI_PORT_DPL,

	QTI_NUM_PORTS

};



struct usb_qdss_bam_connect_info {

	u32 usb_bam_pipe_idx;

drivers/usb/gadget/function/u_qdss.c

+1 −3
Original line number Diff line number Diff line
@@ -13,7 +13,6 @@ 


#include <linux/kernel.h>

#include <linux/device.h>

#include <linux/usb/msm_hsusb.h>

#include <linux/usb_bam.h>



#include "f_qdss.h"
@@ -95,12 +94,11 @@ int set_qdss_data_connection(struct usb_gadget *gadget, 


static int init_data(struct usb_ep *ep)

{

	struct f_qdss *qdss = ep->driver_data;

	int res = 0;



	pr_debug("init_data\n");



	res = msm_ep_config(ep, qdss->endless_req);

	res = msm_ep_config(ep);

	if (res)

		pr_err("msm_ep_config failed\n");