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

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

Merge branch 'for-next' of git://gitorious.org/usb/usb into usb-next 

* 'for-next' of git://gitorious.org/usb/usb:
  usb: musb: gadget: prevent a NULL pointer dereference
  usb: musb: add names for IRQs in structure resource
  usb: musb: remove board_data parameter from musb_platform_init()
parents 16350a72 0607f862

arch/arm/mach-davinci/usb.c

+2 −0
Original line number Diff line number Diff line
@@ -64,10 +64,12 @@ static struct resource usb_resources[] = { 
	{

		.start          = IRQ_USBINT,

		.flags          = IORESOURCE_IRQ,

		.name		= "mc"

	},

	{

		/* placeholder for the dedicated CPPI IRQ */

		.flags          = IORESOURCE_IRQ,

		.name		= "dma"

	},

};

arch/arm/mach-omap2/usb-musb.c

+2 −0
Original line number Diff line number Diff line
@@ -40,10 +40,12 @@ static struct resource musb_resources[] = { 
	[1] = {	/* general IRQ */

		.start	= INT_243X_HS_USB_MC,

		.flags	= IORESOURCE_IRQ,

		.name	= "mc",

	},

	[2] = {	/* DMA IRQ */

		.start	= INT_243X_HS_USB_DMA,

		.flags	= IORESOURCE_IRQ,

		.name	= "dma",

	},

};

arch/blackfin/mach-bf527/boards/cm_bf527.c

+2 −0
Original line number Diff line number Diff line
@@ -82,11 +82,13 @@ static struct resource musb_resources[] = { 
		.start	= IRQ_USB_INT0,

		.end	= IRQ_USB_INT0,

		.flags	= IORESOURCE_IRQ | IORESOURCE_IRQ_HIGHLEVEL,

		.name	= "mc"

	},

	[2] = {	/* DMA IRQ */

		.start	= IRQ_USB_DMA,

		.end	= IRQ_USB_DMA,

		.flags	= IORESOURCE_IRQ | IORESOURCE_IRQ_HIGHLEVEL,

		.name	= "dma"

	},

};

arch/blackfin/mach-bf527/boards/ezbrd.c

+2 −0
Original line number Diff line number Diff line
@@ -46,11 +46,13 @@ static struct resource musb_resources[] = { 
		.start	= IRQ_USB_INT0,

		.end	= IRQ_USB_INT0,

		.flags	= IORESOURCE_IRQ | IORESOURCE_IRQ_HIGHLEVEL,

		.name	= "mc"

	},

	[2] = {	/* DMA IRQ */

		.start	= IRQ_USB_DMA,

		.end	= IRQ_USB_DMA,

		.flags	= IORESOURCE_IRQ | IORESOURCE_IRQ_HIGHLEVEL,

		.name	= "dma"

	},

};

arch/blackfin/mach-bf527/boards/ezkit.c

+2 −0
Original line number Diff line number Diff line
@@ -86,11 +86,13 @@ static struct resource musb_resources[] = { 
		.start	= IRQ_USB_INT0,

		.end	= IRQ_USB_INT0,

		.flags	= IORESOURCE_IRQ | IORESOURCE_IRQ_HIGHLEVEL,

		.name	= "mc"

	},

	[2] = {	/* DMA IRQ */

		.start	= IRQ_USB_DMA,

		.end	= IRQ_USB_DMA,

		.flags	= IORESOURCE_IRQ | IORESOURCE_IRQ_HIGHLEVEL,

		.name	= "dma"

	},

};