aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorValentin Longchamp <valentin.longchamp@epfl.ch>2010-02-09 12:13:35 -0500
committerSascha Hauer <s.hauer@pengutronix.de>2010-02-10 05:11:56 -0500
commitcda82f85c2bba92daa3d017f7c7bc5f8c61a2e11 (patch)
tree056b56d6f9a42a461d39479f18a033d5220a2b2f
parentf8594c283e409024d817e75027074570ce27dcc5 (diff)
mx31moboard: make usbh2 enable gpio claim more atomic
It is more cosmetic than fixing a real problem, but the code looks more logical like that Signed-off-by: Valentin Longchamp <valentin.longchamp@epfl.ch> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
-rw-r--r--arch/arm/mach-mx3/mach-mx31moboard.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/arch/arm/mach-mx3/mach-mx31moboard.c b/arch/arm/mach-mx3/mach-mx31moboard.c
index fe18cd513cd7..c357a72ee406 100644
--- a/arch/arm/mach-mx3/mach-mx31moboard.c
+++ b/arch/arm/mach-mx3/mach-mx31moboard.c
@@ -352,9 +352,7 @@ static struct fsl_usb2_platform_data usb_pdata = {
352 352
353static int moboard_usbh2_hw_init(struct platform_device *pdev) 353static int moboard_usbh2_hw_init(struct platform_device *pdev)
354{ 354{
355 int ret = gpio_request(USBH2_EN_B, "usbh2-en"); 355 int ret;
356 if (ret)
357 return ret;
358 356
359 mxc_iomux_set_gpr(MUX_PGP_UH2, true); 357 mxc_iomux_set_gpr(MUX_PGP_UH2, true);
360 358
@@ -371,6 +369,9 @@ static int moboard_usbh2_hw_init(struct platform_device *pdev)
371 mxc_iomux_set_pad(MX31_PIN_SRXD3, USB_PAD_CFG); 369 mxc_iomux_set_pad(MX31_PIN_SRXD3, USB_PAD_CFG);
372 mxc_iomux_set_pad(MX31_PIN_STXD3, USB_PAD_CFG); 370 mxc_iomux_set_pad(MX31_PIN_STXD3, USB_PAD_CFG);
373 371
372 ret = gpio_request(USBH2_EN_B, "usbh2-en");
373 if (ret)
374 return ret;
374 gpio_direction_output(USBH2_EN_B, 0); 375 gpio_direction_output(USBH2_EN_B, 0);
375 376
376 return 0; 377 return 0;