ENGR00286971-1 imx6q: add sanity check for getting gpio for flexcan

This is used to avoid a warning:
WARNING: at /home/b29397/work/projects/linux-2.6-imx/drivers/gpio/gpiolib.c:126
gpio_to_desc+0x30/0x44()
invalid GPIO -517
Modules linked in:
....
gpiod_request: invalid GPIO

Signed-off-by: Dong Aisheng <b29396@freescale.com>

diff --git a/arch/arm/mach-imx/mach-imx6q.c b/arch/arm/mach-imx/mach-imx6q.c
index 9ee5df639d2a6d6b75595dc89b284ed312f5e818..aac2ab57fafa523a21162bbd02b2acce6c8d120f 100644 (file)
--- a/arch/arm/mach-imx/mach-imx6q.c
+++ b/arch/arm/mach-imx/mach-imx6q.c
@@ -149,7 +149,8 @@ static int __init imx6q_flexcan_fixup_auto(void)
 
        flexcan_en_gpio = of_get_named_gpio(np, "trx-en-gpio", 0);
        flexcan_stby_gpio = of_get_named_gpio(np, "trx-stby-gpio", 0);
-       if (!gpio_request_one(flexcan_en_gpio, GPIOF_DIR_OUT, "flexcan-trx-en") &&
+       if (gpio_is_valid(flexcan_en_gpio) && gpio_is_valid(flexcan_stby_gpio) &&
+               !gpio_request_one(flexcan_en_gpio, GPIOF_DIR_OUT, "flexcan-trx-en") &&
                !gpio_request_one(flexcan_stby_gpio, GPIOF_DIR_OUT, "flexcan-trx-stby")) {
                /* flexcan 0 & 1 are using the same GPIOs for transceiver */
                flexcan_pdata[0].transceiver_switch = imx6q_flexcan0_switch_auto;