From: Nguyen Hong Ky <nh-ky@jinso.co.jp>
To: linux-arm-kernel@lists.infradead.org
Subject: Re: [PATCH] ARM: shmobile: marzen: Use error values in usb_power_*
Date: Tue, 21 May 2013 07:51:14 +0000 [thread overview]
Message-ID: <CAK9_=nDQ01EMOhbRWnMEJP-KKCQ+U5LoKirfEimdTFRU2ABbGw@mail.gmail.com> (raw)
In-Reply-To: <1368679681-10779-1-git-send-email-horms+renesas@verge.net.au>
Tested-by: Nguyen Hong Ky <nh-ky@jinso.co.jp>
On Thu, May 16, 2013 at 1:48 PM, Simon Horman
<horms+renesas@verge.net.au> 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").
>
> 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))
> + return PTR_ERR(phy);
>
> pm_runtime_enable(&pdev->dev);
> pm_runtime_get_sync(&pdev->dev);
> @@ -225,7 +225,7 @@ static int usb_power_on(struct platform_device *pdev)
>
> static void usb_power_off(struct platform_device *pdev)
> {
> - if (!phy)
> + if (IS_ERR(phy))
> return;
>
> usb_phy_shutdown(phy);
> --
> 1.8.2.1
>
> --
> 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: nh-ky@jinso.co.jp (Nguyen Hong Ky)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH] ARM: shmobile: marzen: Use error values in usb_power_*
Date: Tue, 21 May 2013 16:51:14 +0900 [thread overview]
Message-ID: <CAK9_=nDQ01EMOhbRWnMEJP-KKCQ+U5LoKirfEimdTFRU2ABbGw@mail.gmail.com> (raw)
In-Reply-To: <1368679681-10779-1-git-send-email-horms+renesas@verge.net.au>
Tested-by: Nguyen Hong Ky <nh-ky@jinso.co.jp>
On Thu, May 16, 2013 at 1:48 PM, Simon Horman
<horms+renesas@verge.net.au> 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").
>
> 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))
> + return PTR_ERR(phy);
>
> pm_runtime_enable(&pdev->dev);
> pm_runtime_get_sync(&pdev->dev);
> @@ -225,7 +225,7 @@ static int usb_power_on(struct platform_device *pdev)
>
> static void usb_power_off(struct platform_device *pdev)
> {
> - if (!phy)
> + if (IS_ERR(phy))
> return;
>
> usb_phy_shutdown(phy);
> --
> 1.8.2.1
>
> --
> 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
>
next prev parent reply other threads:[~2013-05-21 7:51 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-05-16 4:48 [PATCH] ARM: shmobile: marzen: Use error values in usb_power_* Simon Horman
2013-05-16 4:48 ` Simon Horman
2013-05-21 7:51 ` Nguyen Hong Ky [this message]
2013-05-21 7:51 ` Nguyen Hong Ky
2013-05-22 6:48 [GIT PULL] Renesas ARM SoC based marzen board fix for v3.10 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
2013-05-25 0:59 ` Simon Horman
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='CAK9_=nDQ01EMOhbRWnMEJP-KKCQ+U5LoKirfEimdTFRU2ABbGw@mail.gmail.com' \
--to=nh-ky@jinso.co.jp \
--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.