Don't fail the initialization check for the platform_data if there is avaiable an associated device tree node.
Signed-off-by: Fabio Porcedda <[email protected]> Signed-off-by: Felipe Balbi <[email protected]> --- upstream commit ID: 9c6d196d5aa35e07482f23c3e37755e7a82140e0 kernel to apply: 3.4 3.5 3.6 this is a fix for the commit: d1494a340807c9b77aa44bc8d8166353df4cf1c3 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 d95f6b0..af93128 100644 --- a/drivers/usb/gadget/at91_udc.c +++ b/drivers/usb/gadget/at91_udc.c @@ -1704,7 +1704,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; -- 1.7.11.3 -- To unsubscribe from this list: send the line "unsubscribe stable" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
