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

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

Merge tag 'fixes-for-v3.8-rc2' of... 

Merge tag 'fixes-for-v3.8-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/balbi/usb into usb-linus

Felipe says:
	usb: fixes for v3.8-rc2

	Here is the first set of fixes for v3.8-rc cycle.

	There is a build fix for musb's dsps glue layer caused
	by some header cleanup on the OMAP tree.

	Marvel's USB drivers got a fix up for clk API usage
	switching over to clk_prepare() calls.

	u_serial has a bug fix for a missing wake_up() which
	would make gs_cleanup() wait forever for gs_close()
	to finish.

	A minor bug fix on dwc3's debugfs interface which
	would make us read wrong addresses when dumping
	all registers.

	dummy_hcd learned how to enumerate g_multi.

	s3c-hsotg now understands that we shouldn't kfree()
	memory allocated with devm_*.

	Other than that, there are a bunch of other minor fixes
	on renesas_usbhs, tcm_usb_gadget and amd5536udc.

	All patches have been pending on mailing for many weeks
	and shouldn't cause any problems.
parents d1c3ed66 2ac788f7

drivers/usb/dwc3/debugfs.c

+1 −1
Original line number Diff line number Diff line
@@ -56,7 +56,7 @@ 
#define dump_register(nm)				\

{							\

	.name	= __stringify(nm),			\

	.offset	= DWC3_ ##nm,				\

	.offset	= DWC3_ ##nm - DWC3_GLOBALS_REGS_START,	\

}



static const struct debugfs_reg32 dwc3_regs[] = {

drivers/usb/gadget/amd5536udc.c

+2 −2
Original line number Diff line number Diff line
@@ -3231,7 +3231,7 @@ static int udc_pci_probe( 
	}



	if (!pdev->irq) {

		dev_err(&dev->pdev->dev, "irq not set\n");

		dev_err(&pdev->dev, "irq not set\n");

		kfree(dev);

		dev = NULL;

		retval = -ENODEV;
@@ -3250,7 +3250,7 @@ static int udc_pci_probe( 
	dev->txfifo = (u32 __iomem *)(dev->virt_addr + UDC_TXFIFO_ADDR);



	if (request_irq(pdev->irq, udc_irq, IRQF_SHARED, name, dev) != 0) {

		dev_dbg(&dev->pdev->dev, "request_irq(%d) fail\n", pdev->irq);

		dev_dbg(&pdev->dev, "request_irq(%d) fail\n", pdev->irq);

		kfree(dev);

		dev = NULL;

		retval = -EBUSY;

drivers/usb/gadget/dummy_hcd.c

+5 −4
Original line number Diff line number Diff line
@@ -130,10 +130,7 @@ static const char ep0name[] = "ep0"; 
static const char *const ep_name[] = {

	ep0name,				/* everyone has ep0 */



	/* act like a net2280: high speed, six configurable endpoints */

	"ep-a", "ep-b", "ep-c", "ep-d", "ep-e", "ep-f",



	/* or like pxa250: fifteen fixed function endpoints */

	/* act like a pxa250: fifteen fixed function endpoints */

	"ep1in-bulk", "ep2out-bulk", "ep3in-iso", "ep4out-iso", "ep5in-int",

	"ep6in-bulk", "ep7out-bulk", "ep8in-iso", "ep9out-iso", "ep10in-int",

	"ep11in-bulk", "ep12out-bulk", "ep13in-iso", "ep14out-iso",
@@ -141,6 +138,10 @@ static const char *const ep_name[] = { 


	/* or like sa1100: two fixed function endpoints */

	"ep1out-bulk", "ep2in-bulk",



	/* and now some generic EPs so we have enough in multi config */

	"ep3out", "ep4in", "ep5out", "ep6out", "ep7in", "ep8out", "ep9in",

	"ep10out", "ep11out", "ep12in", "ep13out", "ep14in", "ep15out",

};

#define DUMMY_ENDPOINTS	ARRAY_SIZE(ep_name)

drivers/usb/gadget/mv_udc_core.c

+2 −2
Original line number Diff line number Diff line
@@ -1012,7 +1012,7 @@ static void udc_clock_enable(struct mv_udc *udc) 
	unsigned int i;



	for (i = 0; i < udc->clknum; i++)

		clk_enable(udc->clk[i]);

		clk_prepare_enable(udc->clk[i]);

}



static void udc_clock_disable(struct mv_udc *udc)
@@ -1020,7 +1020,7 @@ static void udc_clock_disable(struct mv_udc *udc) 
	unsigned int i;



	for (i = 0; i < udc->clknum; i++)

		clk_disable(udc->clk[i]);

		clk_disable_unprepare(udc->clk[i]);

}



static void udc_stop(struct mv_udc *udc)

drivers/usb/gadget/s3c-hsotg.c

+2 −3
Original line number Diff line number Diff line
@@ -3477,12 +3477,11 @@ static void s3c_hsotg_delete_debug(struct s3c_hsotg *hsotg) 
/**

 * s3c_hsotg_release - release callback for hsotg device

 * @dev: Device to for which release is called

 *

 * Nothing to do as the resource is allocated using devm_ API.

 */

static void s3c_hsotg_release(struct device *dev)

{

	struct s3c_hsotg *hsotg = dev_get_drvdata(dev);



	kfree(hsotg);

}



/**