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

Commit 56aa45ad authored by Kishon Vijay Abraham I's avatar Kishon Vijay Abraham I Committed by Felipe Balbi
Browse files

usb: gadget: make usb functions to load before gadget driver 



The current ordering in makefile makes gadget
drivers be loaded before usb functions which
causes usb_get_function_instance() to fail when
gadget modules are statically linked to the
kernel binary.

Changed the ordering here so that USB functions
are loaded before gadget drivers.

Note that this is only a temporary solution and
a more robust fix is needed in the long run.

Signed-off-by: default avatarKishon Vijay Abraham I <kishon@ti.com>
Signed-off-by: default avatarFelipe Balbi <balbi@ti.com>
parent fe2a4297

drivers/usb/gadget/Makefile

+6 −6
Original line number Diff line number Diff line
@@ -35,6 +35,12 @@ mv_udc-y := mv_udc_core.o 
obj-$(CONFIG_USB_FUSB300)	+= fusb300_udc.o

obj-$(CONFIG_USB_MV_U3D)	+= mv_u3d_core.o



# USB Functions

obj-$(CONFIG_USB_F_ACM)		+= f_acm.o

f_ss_lb-y			:= f_loopback.o f_sourcesink.o

obj-$(CONFIG_USB_F_SS_LB)	+= f_ss_lb.o

obj-$(CONFIG_USB_U_SERIAL)	+= u_serial.o



#

# USB gadget drivers

#
@@ -74,9 +80,3 @@ obj-$(CONFIG_USB_G_WEBCAM) += g_webcam.o 
obj-$(CONFIG_USB_G_NCM)		+= g_ncm.o

obj-$(CONFIG_USB_G_ACM_MS)	+= g_acm_ms.o

obj-$(CONFIG_USB_GADGET_TARGET)	+= tcm_usb_gadget.o
 


# USB Functions

obj-$(CONFIG_USB_F_ACM)		+= f_acm.o

f_ss_lb-y			:= f_loopback.o f_sourcesink.o

obj-$(CONFIG_USB_F_SS_LB)	+= f_ss_lb.o

obj-$(CONFIG_USB_U_SERIAL)	+= u_serial.o