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

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

Merge tag 'fixes-for-v4.3-rc4' of... 

Merge tag 'fixes-for-v4.3-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/balbi/usb

 into usb-linus

Felipe writes:

usb: fixes for v4.3-rc4

A memory leak fix for the BCD UDC driver, a build
warning fix on Renesas and a new device ID for R-Car H3.

Nothing major.

Signed-off-by: default avatarFelipe Balbi <balbi@ti.com>
parents 9ffecb10 f5f6afa8

Documentation/devicetree/bindings/usb/renesas_usbhs.txt

+1 −0
Original line number Diff line number Diff line
@@ -5,6 +5,7 @@ Required properties: 
	- "renesas,usbhs-r8a7790"

	- "renesas,usbhs-r8a7791"

	- "renesas,usbhs-r8a7794"

	- "renesas,usbhs-r8a7795"

  - reg: Base address and length of the register for the USBHS

  - interrupts: Interrupt specifier for the USBHS

  - clocks: A list of phandle + clock specifier pairs

drivers/usb/gadget/udc/bdc/bdc_ep.c

+3 −1
Original line number Diff line number Diff line
@@ -159,8 +159,10 @@ static int ep_bd_list_alloc(struct bdc_ep *ep) 
		bd_table->start_bd = dma_pool_alloc(bdc->bd_table_pool,

							GFP_ATOMIC,

							&dma);

		if (!bd_table->start_bd)

		if (!bd_table->start_bd) {

			kfree(bd_table);

			goto fail;

		}



		bd_table->dma = dma;

drivers/usb/renesas_usbhs/common.c

+6 −1
Original line number Diff line number Diff line
@@ -476,6 +476,11 @@ static const struct of_device_id usbhs_of_match[] = { 
		.compatible = "renesas,usbhs-r8a7794",

		.data = (void *)USBHS_TYPE_RCAR_GEN2,

	},

	{

		/* Gen3 is compatible with Gen2 */

		.compatible = "renesas,usbhs-r8a7795",

		.data = (void *)USBHS_TYPE_RCAR_GEN2,

	},

	{ },

};

MODULE_DEVICE_TABLE(of, usbhs_of_match);
@@ -493,7 +498,7 @@ static struct renesas_usbhs_platform_info *usbhs_parse_dt(struct device *dev) 
		return NULL;



	dparam = &info->driver_param;

	dparam->type = of_id ? (u32)of_id->data : 0;

	dparam->type = of_id ? (uintptr_t)of_id->data : 0;

	if (!of_property_read_u32(dev->of_node, "renesas,buswait", &tmp))

		dparam->buswait_bwait = tmp;

	gpio = of_get_named_gpio_flags(dev->of_node, "renesas,enable-gpio", 0,

include/linux/usb/renesas_usbhs.h

+1 −1
Original line number Diff line number Diff line
@@ -157,7 +157,7 @@ struct renesas_usbhs_driver_param { 
	 */

	int pio_dma_border; /* default is 64byte */



	u32 type;

	uintptr_t type;

	u32 enable_gpio;



	/*