[PATCH v2] usb: gadget: at91_udc: dt: fix platform_data check

[PATCH v2] usb: gadget: at91_udc: dt: fix platform_data check

[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 <fabio.porcedda-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
Cc: Stable <stable-u79uwXL29TY76Z2rM5mHXA@public.gmane.org> [v3.4+]
Cc: Jean-Christophe PLAGNIOL-VILLARD <plagnioj-sclMFOaUSTBWk0Htik3J/w@public.gmane.org>
---
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;
-- 
1.7.11.3

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

Re: [PATCH v2] usb: gadget: at91_udc: dt: fix platform_data check

[Nicolas Ferre]

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 <fabio.porcedda-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
> Cc: Stable <stable-u79uwXL29TY76Z2rM5mHXA@public.gmane.org> [v3.4+]
> Cc: Jean-Christophe PLAGNIOL-VILLARD <plagnioj-sclMFOaUSTBWk0Htik3J/w@public.gmane.org>

Acked-by: Nicolas Ferre <nicolas.ferre-AIFe0yeh4nAAvxtiuMwx3w@public.gmane.org>

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 majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: [PATCH v2] usb: gadget: at91_udc: dt: fix platform_data check

[Felipe Balbi]

[-- Attachment #1: Type: text/plain, Size: 1065 bytes --]

Hi,

On Tue, Sep 11, 2012 at 02:20:19PM +0200, Nicolas Ferre wrote:
> 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 <fabio.porcedda-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
> > Cc: Stable <stable-u79uwXL29TY76Z2rM5mHXA@public.gmane.org> [v3.4+]
> > Cc: Jean-Christophe PLAGNIOL-VILLARD <plagnioj-sclMFOaUSTBWk0Htik3J/w@public.gmane.org>
> 
> Acked-by: Nicolas Ferre <nicolas.ferre-AIFe0yeh4nAAvxtiuMwx3w@public.gmane.org>
> 
> Felipe, Greg, can we queue this one for 3.6-final ?

I had already taken the other version before Fabio sent this v2... it's
now merged in greg/usb-next branch. I suggest doing a cherry-pick for
stable tree and resending the patch once v3.7-rc1 is tagged.

cheers

-- 
balbi

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 836 bytes --]

Re: [PATCH v2] usb: gadget: at91_udc: dt: fix platform_data check

[Nicolas Ferre]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

On 09/12/2012 08:14 AM, Felipe Balbi :
> Hi,
> 
> On Tue, Sep 11, 2012 at 02:20:19PM +0200, Nicolas Ferre wrote:
>> 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 <fabio.porcedda-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org> Cc:
>>> Stable <stable-u79uwXL29TY76Z2rM5mHXA@public.gmane.org> [v3.4+] Cc: Jean-Christophe
>>> PLAGNIOL-VILLARD <plagnioj-sclMFOaUSTBWk0Htik3J/w@public.gmane.org>
>> 
>> Acked-by: Nicolas Ferre <nicolas.ferre-AIFe0yeh4nAAvxtiuMwx3w@public.gmane.org>
>> 
>> Felipe, Greg, can we queue this one for 3.6-final ?
> 
> I had already taken the other version before Fabio sent this v2...
> it's now merged in greg/usb-next branch. I suggest doing a
> cherry-pick for stable tree and resending the patch once v3.7-rc1
> is tagged.

Sure! No need to move to this v2.

We will do as you suggest for the stable branch inclusion.

Thanks, best regards,
- -- 
Nicolas Ferre
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.11 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://www.enigmail.net/

iQEcBAEBAgAGBQJQUDrVAAoJEAf03oE53VmQ8egH/2FTpGw98GJ47MzNKFaZvbGV
2ZrQTHsO2xOKenG+Chf/0oDkKROzQYgxGjfogDQmfhYPHkdqTdSRL5CD6hZSnhDo
Qvusw9XmOdikhBcTQKrrSxOyfoo1BcKFH07TunWfM2LXWrHUptk3jMb7Un62QGVa
wFYeHdkI+gwCbzcN+b9iV/qKYmkpfv71y0uved//OVBxXuBqoKOHTNlAZ1p5OT4r
GRj0zgq4tes8W1QeXDKOCu1oMqbH1qNqnklFWu0JzoiqhX809t9rYurZTep7YzWO
5+n1zV80qpMbXeClw/GgHKvt9WmA1afMTyMNryS5PTijEauc6ifidUrikIL+NuQ=
=w2cu
-----END PGP SIGNATURE-----
--
To unsubscribe from this list: send the line "unsubscribe linux-usb" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html