summaryrefslogtreecommitdiff
path: root/arch/arm/mach-imx/mx31moboard-marxbot.c
diff options
context:
space:
mode:
authorFabian Frederick <fabf@skynet.be>2014-07-04 21:03:10 +0200
committerShawn Guo <shawn.guo@freescale.com>2014-07-18 16:11:36 +0800
commitd3a22442307a37225d99a5137fcbd9fbb2f5c343 (patch)
tree58f29e663daeb2f9832c00fbcdbf85332730ccb1 /arch/arm/mach-imx/mx31moboard-marxbot.c
parent26651c4376454b8a9422577e57c59b6cc37c603d (diff)
ARM: imx: use PTR_ERR_OR_ZERO
replace IS_ERR/PTR_ERR Cc: Sascha Hauer <kernel@pengutronix.de> Cc: linux-arm-kernel@lists.infradead.org Signed-off-by: Fabian Frederick <fabf@skynet.be> Signed-off-by: Shawn Guo <shawn.guo@freescale.com>
Diffstat (limited to 'arch/arm/mach-imx/mx31moboard-marxbot.c')
-rw-r--r--arch/arm/mach-imx/mx31moboard-marxbot.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/arch/arm/mach-imx/mx31moboard-marxbot.c b/arch/arm/mach-imx/mx31moboard-marxbot.c
index 699d01a4fef8..2e895a82a6eb 100644
--- a/arch/arm/mach-imx/mx31moboard-marxbot.c
+++ b/arch/arm/mach-imx/mx31moboard-marxbot.c
@@ -328,10 +328,8 @@ static int __init marxbot_usbh1_init(void)
usbh1_pdata.otg = phy;
pdev = imx31_add_mxc_ehci_hs(1, &usbh1_pdata);
- if (IS_ERR(pdev))
- return PTR_ERR(pdev);
- return 0;
+ return PTR_ERR_OR_ZERO(pdev);
}
static const struct fsl_usb2_platform_data usb_pdata __initconst = {