On 09/11/2012 02:07 PM, Fabio Porcedda :
> Don't fail the initialization check for the platform_data
> if there is avaiable an associated device tree node.
>
> This patch fix the dt support introduced in 3.4-rc1 by commit
> ("d1494a3 USB: at91: Device udc add dt support").
>
> Tested on a at91sam9260 based board (PRO3-EVK).
>
> Signed-off-by: Fabio Porcedda <[email protected]>
> Cc: Stable <[email protected]> [v3.4+]
> Cc: Jean-Christophe PLAGNIOL-VILLARD <[email protected]>
Acked-by: Nicolas Ferre <[email protected]>
Felipe, Greg, can we queue this one for 3.6-final ?
Best regards,
> ---
> v2:
> - better description
> - add stable tag
>
> drivers/usb/gadget/at91_udc.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/usb/gadget/at91_udc.c b/drivers/usb/gadget/at91_udc.c
> index 1e35963..660fd53 100644
> --- a/drivers/usb/gadget/at91_udc.c
> +++ b/drivers/usb/gadget/at91_udc.c
> @@ -1699,7 +1699,7 @@ static int __devinit at91udc_probe(struct
> platform_device *pdev)
> int retval;
> struct resource *res;
>
> - if (!dev->platform_data) {
> + if (!dev->platform_data && !pdev->dev.of_node) {
> /* small (so we copy it) but critical! */
> DBG("missing platform_data\n");
> return -ENODEV;
>
--
Nicolas Ferre
--
To unsubscribe from this list: send the line "unsubscribe linux-usb" in
the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
