Skip to content

Commit

Permalink
ARM: shmobile: marzen: Use error values in usb_power_*
Browse files Browse the repository at this point in the history
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
b7fa5c2
("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>
  • Loading branch information
Simon Horman committed May 22, 2013
1 parent f722406 commit 5f10428
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions arch/arm/mach-shmobile/board-marzen.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand All @@ -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);
Expand Down

0 comments on commit 5f10428

Please sign in to comment.