Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 580b000d authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'renesas-boards-marzen-fixes-for-v3.10' of... 

Merge tag 'renesas-boards-marzen-fixes-for-v3.10' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into fixes

From Simon Horman:
Correct USB PHY initialisation on the marzen board.

* tag 'renesas-boards-marzen-fixes-for-v3.10' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas

:
  ARM: shmobile: marzen: Use error values in usb_power_*

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents 25625c93 5f10428e

arch/arm/mach-shmobile/board-marzen.c

+3 −3
Original line number Diff line number Diff line
@@ -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);