All of lore.kernel.org
 help / color / mirror / Atom feed
From: Simon Horman <horms@verge.net.au>
To: linux-arm-kernel@lists.infradead.org
Subject: Re: [PATCH] ARM: shmobile: marzen: Use error values in usb_power_*
Date: Sat, 25 May 2013 00:59:08 +0000	[thread overview]
Message-ID: <20130525005908.GE4476@verge.net.au> (raw)
In-Reply-To: <519D217D.2060405@cogentembedded.com>

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
> 

WARNING: multiple messages have this Message-ID (diff)
From: horms@verge.net.au (Simon Horman)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH] ARM: shmobile: marzen: Use error values in usb_power_*
Date: Sat, 25 May 2013 09:59:08 +0900	[thread overview]
Message-ID: <20130525005908.GE4476@verge.net.au> (raw)
In-Reply-To: <519D217D.2060405@cogentembedded.com>

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

  reply	other threads:[~2013-05-25  0:59 UTC|newest]

Thread overview: 12+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-05-22  6:48 [GIT PULL] Renesas ARM SoC based marzen board fix for v3.10 Simon Horman
2013-05-22  6:48 ` Simon Horman
2013-05-22  6:48 ` [PATCH] ARM: shmobile: marzen: Use error values in usb_power_* Simon Horman
2013-05-22  6:48   ` Simon Horman
2013-05-22 19:50   ` Sergei Shtylyov
2013-05-22 19:50     ` Sergei Shtylyov
2013-05-25  0:59     ` Simon Horman [this message]
2013-05-25  0:59       ` Simon Horman
  -- strict thread matches above, loose matches on Subject: below --
2013-05-16  4:48 Simon Horman
2013-05-16  4:48 ` Simon Horman
2013-05-21  7:51 ` Nguyen Hong Ky
2013-05-21  7:51   ` Nguyen Hong Ky

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20130525005908.GE4476@verge.net.au \
    --to=horms@verge.net.au \
    --cc=linux-arm-kernel@lists.infradead.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.