Re: [patch 2.6.29-rc2 5/9] prevent musb init oops (otg related)

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



On Saturday 24 January 2009, David Brownell wrote:
> From: Ajay Kumar Gupta <ajay.gupta@xxxxxx>
> Subject: usb: musb: fix null pointer check in musb_platform_init()
> 
> Fixes kernel panic when musb is selected for OMAP35x EVM but twl4030 is not
> selected as in this case otg_get_transceiver() returns null.
> 
> Signed-off-by: Ajay Kumar Gupta <ajay.gupta@xxxxxx>
> Acked-by: Felipe Balbi <felipe.balbi@xxxxxxxxx>
> Signed-off-by: David Brownell <dbrownell@xxxxxxxxxxxxxxxxxxxxx>

Grr, please forget this one.  It fixes a bug in
some other patch, which doesn't seem to be in any
merge queue.  Merging this creates a new build error.
(It's your "usb-prevent-musb-init-oops.patch".)

Sigh.

- Dave


> ---
>  drivers/usb/musb/omap2430.c |    4 ++++
>  1 file changed, 4 insertions(+)
> 
> --- a/drivers/usb/musb/omap2430.c
> +++ b/drivers/usb/musb/omap2430.c
> @@ -231,6 +231,10 @@ int __init musb_platform_init(struct mus
>  #if defined(CONFIG_ARCH_OMAP2430)
>  	omap_cfg_reg(AE5_2430_USB0HS_STP);
>  #endif
> +	if (!x) {
> +		pr_err("omap: musb: null transceiver found\n");
> +		return -ENODEV;
> +	}
>  
>  	musb_platform_resume(musb);
>  
> 


--
To unsubscribe from this list: send the line "unsubscribe linux-usb" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[Index of Archives]     [Linux Media]     [Linux Input]     [Linux Audio Users]     [Yosemite News]     [Linux Kernel]     [Linux SCSI]     [Old Linux USB Devel Archive]

  Powered by Linux