All of lore.kernel.org
 help / color / mirror / Atom feed
* [GIT PULL] Renesas ARM SoC based marzen board fix for v3.10
@ 2013-05-22  6:48 ` Simon Horman
  0 siblings, 0 replies; 12+ messages in thread
From: Simon Horman @ 2013-05-22  6:48 UTC (permalink / raw)
  To: linux-arm-kernel

Hi Arnd, Hi Olof,

please consider the following fix for v3.10.
It resolves a boot-failure regression on the marzen board.

The following changes since commit f722406faae2d073cc1d01063d1123c35425939e:

  Linux 3.10-rc1 (2013-05-11 17:14:08 -0700)

are available in the git repository at:

  git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git tags/renesas-boards-marzen-fixes-for-v3.10

for you to fetch changes up to 5f10428e4a6d99cc019270c51ad5a33fb38addeb:

  ARM: shmobile: marzen: Use error values in usb_power_* (2013-05-22 15:43:16 +0900)

----------------------------------------------------------------
Correct USB PHY initialisation on the marzen board.

----------------------------------------------------------------
Simon Horman (1):
      ARM: shmobile: marzen: Use error values in usb_power_*

 arch/arm/mach-shmobile/board-marzen.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

^ permalink raw reply	[flat|nested] 12+ messages in thread
* [PATCH] ARM: shmobile: marzen: Use error values in usb_power_*
@ 2013-05-16  4:48 ` Simon Horman
  0 siblings, 0 replies; 12+ messages in thread
From: Simon Horman @ 2013-05-16  4:48 UTC (permalink / raw)
  To: linux-arm-kernel

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


^ permalink raw reply related	[flat|nested] 12+ messages in thread

end of thread, other threads:[~2013-05-25  0:59 UTC | newest]

Thread overview: 12+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
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
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

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.