Patchwork [GIT,PULL] Renesas ARM SoC based marzen board fix for v3.10

login
register
mail settings
Submitter Simon Horman
Date May 22, 2013, 6:48 a.m.
Message ID <1369205290-6272-1-git-send-email-horms+renesas@verge.net.au>
Download mbox
Permalink /patch/245559/
State New
Headers show

Pull-request

git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git tags/renesas-boards-marzen-fixes-for-v3.10

Comments

Simon Horman - May 22, 2013, 6:48 a.m.
Hi Arnd, Hi Olof,

please consider the following fix for v3.10.
It resolves a boot-failure regression on the marzen board.

The following changes since commit f722406faae2d073cc1d01063d1123c35425939e:

  Linux 3.10-rc1 (2013-05-11 17:14:08 -0700)

are available in the git repository at:

  git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git tags/renesas-boards-marzen-fixes-for-v3.10

for you to fetch changes up to 5f10428e4a6d99cc019270c51ad5a33fb38addeb:

  ARM: shmobile: marzen: Use error values in usb_power_* (2013-05-22 15:43:16 +0900)

----------------------------------------------------------------
Correct USB PHY initialisation on the marzen board.

----------------------------------------------------------------
Simon Horman (1):
      ARM: shmobile: marzen: Use error values in usb_power_*

 arch/arm/mach-shmobile/board-marzen.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
Sergei Shtylyov - May 22, 2013, 7:50 p.m.
Hello.

On 05/22/2013 10:48 AM, Simon Horman wrote:

> This patch updates the marzen board code as if USB PHY isn't enabled
> they phy will have a value set by ERR_PTR() rather than be NULL.
>
> Without this patch a NULL pointer dereference  and kernel panic
> occurs on initialisation of USB on marzen.
>
> This resolves a regression introduced in 3.10-rc1 by
> b7fa5c2aec5be083eb2719b405089703608e9bc6
> ("usb: phy: return -ENXIO when PHY layer isn't enabled").
>
> Tested-by: Nguyen Hong Ky <nh-ky@jinso.co.jp>
> Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
> ---
>   arch/arm/mach-shmobile/board-marzen.c | 6 +++---
>   1 file changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/arch/arm/mach-shmobile/board-marzen.c b/arch/arm/mach-shmobile/board-marzen.c
> index 9105285..b9594e9 100644
> --- a/arch/arm/mach-shmobile/board-marzen.c
> +++ b/arch/arm/mach-shmobile/board-marzen.c
> @@ -212,8 +212,8 @@ static struct platform_device *marzen_devices[] __initdata = {
>   static struct usb_phy *phy;
>   static int usb_power_on(struct platform_device *pdev)
>   {
> -	if (!phy)
> -		return -EIO;
> +	if (IS_ERR(phy))

    And even before the mentioned commit the right check should have 
been IS_ERR_OR_NULL().
Thanks for finding/fixing this. Too bad I'll have to respin my USB 
patches now... :-)

WBR, Sergei
Simon Horman - May 25, 2013, 12:59 a.m.
On Wed, May 22, 2013 at 11:50:21PM +0400, Sergei Shtylyov wrote:
> Hello.
> 
> On 05/22/2013 10:48 AM, Simon Horman wrote:
> 
> >This patch updates the marzen board code as if USB PHY isn't enabled
> >they phy will have a value set by ERR_PTR() rather than be NULL.
> >
> >Without this patch a NULL pointer dereference  and kernel panic
> >occurs on initialisation of USB on marzen.
> >
> >This resolves a regression introduced in 3.10-rc1 by
> >b7fa5c2aec5be083eb2719b405089703608e9bc6
> >("usb: phy: return -ENXIO when PHY layer isn't enabled").
> >
> >Tested-by: Nguyen Hong Ky <nh-ky@jinso.co.jp>
> >Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
> >---
> >  arch/arm/mach-shmobile/board-marzen.c | 6 +++---
> >  1 file changed, 3 insertions(+), 3 deletions(-)
> >
> >diff --git a/arch/arm/mach-shmobile/board-marzen.c b/arch/arm/mach-shmobile/board-marzen.c
> >index 9105285..b9594e9 100644
> >--- a/arch/arm/mach-shmobile/board-marzen.c
> >+++ b/arch/arm/mach-shmobile/board-marzen.c
> >@@ -212,8 +212,8 @@ static struct platform_device *marzen_devices[] __initdata = {
> >  static struct usb_phy *phy;
> >  static int usb_power_on(struct platform_device *pdev)
> >  {
> >-	if (!phy)
> >-		return -EIO;
> >+	if (IS_ERR(phy))
> 
>    And even before the mentioned commit the right check should have
> been IS_ERR_OR_NULL().

Yes, quite true.

> Thanks for finding/fixing this. Too bad I'll have to respin my USB
> patches now... :-)
> 
> WBR, Sergei
> 
> --
> To unsubscribe from this list: send the line "unsubscribe linux-sh" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
>