diff options
| author | Olof Johansson | 2013-05-22 22:11:11 +0200 |
|---|---|---|
| committer | Olof Johansson | 2013-05-22 22:11:21 +0200 |
| commit | 580b000d7c9f77a9829fd255bb15b801bfd3119d (patch) | |
| tree | 29431623255925d6bbbd24c67064943bf307c1bf /arch | |
| parent | Merge tag 'omap-fixes-a-for-3.10-rc' of git://git.kernel.org/pub/scm/linux/ke... (diff) | |
| parent | ARM: shmobile: marzen: Use error values in usb_power_* (diff) | |
| download | kernel-qcow2-linux-580b000d7c9f77a9829fd255bb15b801bfd3119d.tar.gz kernel-qcow2-linux-580b000d7c9f77a9829fd255bb15b801bfd3119d.tar.xz kernel-qcow2-linux-580b000d7c9f77a9829fd255bb15b801bfd3119d.zip | |
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: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/mach-shmobile/board-marzen.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm/mach-shmobile/board-marzen.c b/arch/arm/mach-shmobile/board-marzen.c index 91052855cc12..b9594e911ce7 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); |