| Message ID | 1246965322-14449-1-git-send-email-ext-roger.quadros@nokia.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 9cea4f1eda7e18a59a6f6a5d9edc6384318df492 |
| Headers | show |
On Tue, Jul 07, 2009 at 01:15:22PM +0200, Quadros Roger (EXT-Teleca/Helsinki) wrote: > Add OTG transceiver to RX51 platform data to prevent kernel NULL pointer > dereference during MUSB initialisation. > > Signed-off-by: Roger Quadros <ext-roger.quadros@nokia.com> Signed-off-by: Felipe Balbi <felipe.balbi@nokia.com> > --- > arch/arm/mach-omap2/board-rx51-peripherals.c | 5 +++++ > 1 files changed, 5 insertions(+), 0 deletions(-) > > diff --git a/arch/arm/mach-omap2/board-rx51-peripherals.c b/arch/arm/mach-omap2/board-rx51-peripherals.c > index 9a0bf67..56d931a 100644 > --- a/arch/arm/mach-omap2/board-rx51-peripherals.c > +++ b/arch/arm/mach-omap2/board-rx51-peripherals.c > @@ -278,6 +278,10 @@ static struct twl4030_gpio_platform_data rx51_gpio_data = { > .setup = rx51_twlgpio_setup, > }; > > +static struct twl4030_usb_data rx51_usb_data = { > + .usb_mode = T2_USB_MODE_ULPI, > +}; > + > static struct twl4030_platform_data rx51_twldata = { > .irq_base = TWL4030_IRQ_BASE, > .irq_end = TWL4030_IRQ_END, > @@ -286,6 +290,7 @@ static struct twl4030_platform_data rx51_twldata = { > .gpio = &rx51_gpio_data, > .keypad = &rx51_kp_data, > .madc = &rx51_madc_data, > + .usb = &rx51_usb_data, > > .vaux1 = &rx51_vaux1, > .vaux2 = &rx51_vaux2, > -- > 1.6.0.4
This patch has been applied to the linux-omap by youw fwiendly patch wobot. Branch in linux-omap: omap-fixes Initial commit ID (Likely to change): 9cea4f1eda7e18a59a6f6a5d9edc6384318df492 PatchWorks http://patchwork.kernel.org/patch/34410/ Git (Likely to change, and takes a while to get mirrored) http://git.kernel.org/?p=linux/kernel/git/tmlind/linux-omap-2.6.git;a=commit;h=9cea4f1eda7e18a59a6f6a5d9edc6384318df492 -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/arch/arm/mach-omap2/board-rx51-peripherals.c b/arch/arm/mach-omap2/board-rx51-peripherals.c index 9a0bf67..56d931a 100644 --- a/arch/arm/mach-omap2/board-rx51-peripherals.c +++ b/arch/arm/mach-omap2/board-rx51-peripherals.c @@ -278,6 +278,10 @@ static struct twl4030_gpio_platform_data rx51_gpio_data = { .setup = rx51_twlgpio_setup, }; +static struct twl4030_usb_data rx51_usb_data = { + .usb_mode = T2_USB_MODE_ULPI, +}; + static struct twl4030_platform_data rx51_twldata = { .irq_base = TWL4030_IRQ_BASE, .irq_end = TWL4030_IRQ_END, @@ -286,6 +290,7 @@ static struct twl4030_platform_data rx51_twldata = { .gpio = &rx51_gpio_data, .keypad = &rx51_kp_data, .madc = &rx51_madc_data, + .usb = &rx51_usb_data, .vaux1 = &rx51_vaux1, .vaux2 = &rx51_vaux2,
Add OTG transceiver to RX51 platform data to prevent kernel NULL pointer dereference during MUSB initialisation. Signed-off-by: Roger Quadros <ext-roger.quadros@nokia.com> --- arch/arm/mach-omap2/board-rx51-peripherals.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-)