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

Commit 0b9b6df9 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Merge tag 'usb-for-v3.10-part2' of... 

Merge tag 'usb-for-v3.10-part2' of git://git.kernel.org/pub/scm/linux/kernel/git/balbi/usb into usb-next

Felipe writes:

usb: urgent fixes for v3.10 merge window

Here are some late urgent fixes for v3.10 merge window.

All of these errors were introduced by recent commits
which are in linux-next.

f_obex, multi and cdc2 gadget drivers have learned to
return a proper error code when something goes wrong.

usb_bind_phy() was mistakenly placed into .init.text
section which caused Section mismatch warnings and undefined
reference compile errors.

f_source_sink had a copy-paste error which is now corrected.

g_zero got a memory leak plugged.

Two defconfigs got fixed to enable the newly introduced
CONFIG_USB_PHY.
parents 4601de80 added5fc

arch/arm/configs/imx_v6_v7_defconfig

+1 −0
Original line number Diff line number Diff line
@@ -188,6 +188,7 @@ CONFIG_USB_EHCI_HCD=y 
CONFIG_USB_EHCI_MXC=y

CONFIG_USB_CHIPIDEA=y

CONFIG_USB_CHIPIDEA_HOST=y

CONFIG_USB_PHY=y

CONFIG_USB_MXS_PHY=y

CONFIG_USB_STORAGE=y

CONFIG_MMC=y

arch/arm/configs/mxs_defconfig

+1 −0
Original line number Diff line number Diff line
@@ -120,6 +120,7 @@ CONFIG_USB_EHCI_HCD=y 
CONFIG_USB_CHIPIDEA=y

CONFIG_USB_CHIPIDEA_HOST=y

CONFIG_USB_STORAGE=y

CONFIG_USB_PHY=y

CONFIG_USB_MXS_PHY=y

CONFIG_MMC=y

CONFIG_MMC_MXS=y

drivers/usb/gadget/cdc2.c

+3 −1
Original line number Diff line number Diff line
@@ -129,8 +129,10 @@ static int __init cdc_do_config(struct usb_configuration *c) 
		return PTR_ERR(fi_serial);



	f_acm = usb_get_function(fi_serial);

	if (IS_ERR(f_acm))

	if (IS_ERR(f_acm)) {

		status = PTR_ERR(f_acm);

		goto err_func_acm;

	}



	status = usb_add_function(c, f_acm);

	if (status)

drivers/usb/gadget/f_obex.c

+1 −0
Original line number Diff line number Diff line
@@ -348,6 +348,7 @@ static int obex_bind(struct usb_configuration *c, struct usb_function *f) 


	/* allocate instance-specific endpoints */



	status = -ENODEV;

	ep = usb_ep_autoconfig(cdev->gadget, &obex_fs_ep_in_desc);

	if (!ep)

		goto fail;

drivers/usb/gadget/f_sourcesink.c

+2 −2
Original line number Diff line number Diff line
@@ -898,7 +898,7 @@ static struct usb_function *source_sink_alloc_func( 
	return &ss->function;

}



static void acm_free_instance(struct usb_function_instance *fi)

static void source_sink_free_instance(struct usb_function_instance *fi)

{

	struct f_ss_opts *ss_opts;
@@ -913,7 +913,7 @@ static struct usb_function_instance *source_sink_alloc_inst(void) 
	ss_opts = kzalloc(sizeof(*ss_opts), GFP_KERNEL);

	if (!ss_opts)

		return ERR_PTR(-ENOMEM);

	ss_opts->func_inst.free_func_inst = acm_free_instance;

	ss_opts->func_inst.free_func_inst = source_sink_free_instance;

	return &ss_opts->func_inst;

}

DECLARE_USB_FUNCTION(SourceSink, source_sink_alloc_inst,