From: 黄涛 <huangtao@rock-chips.com>
Date: Mon, 5 Sep 2011 02:38:45 +0000 (+0800)
Subject: ddr3sdk: fix "TOUCH_SCREEN_DISPLAY_PIN gpio_request err" warning
X-Git-Tag: firefly_0821_release~9767^2~42
X-Git-Url: http://plrg.eecs.uci.edu/git/?a=commitdiff_plain;h=787482795f08208689809f54a0d5c0ed76ee06dc;p=firefly-linux-kernel-4.4.55.git

ddr3sdk: fix "TOUCH_SCREEN_DISPLAY_PIN gpio_request err" warning
---

diff --git a/arch/arm/mach-rk29/board-rk29-ddr3sdk.c b/arch/arm/mach-rk29/board-rk29-ddr3sdk.c
index de48ad040ab4..49311b77156d 100644
--- a/arch/arm/mach-rk29/board-rk29-ddr3sdk.c
+++ b/arch/arm/mach-rk29/board-rk29-ddr3sdk.c
@@ -260,7 +260,7 @@ static int rk29_fb_io_init(struct rk29_fb_setting_info *fb_setting)
                 printk(">>>>>> FB_DISPLAY_ON_PIN gpio_request err \n ");
             }
         }
-        else
+        else if (TOUCH_SCREEN_DISPLAY_PIN != INVALID_GPIO)
         {
              ret = gpio_request(TOUCH_SCREEN_DISPLAY_PIN, NULL);
              if(ret != 0)
@@ -284,7 +284,7 @@ static int rk29_fb_io_init(struct rk29_fb_setting_info *fb_setting)
                  printk(">>>>>> FB_LCD_STANDBY_PIN gpio_request err \n ");
              }
         }
-        else
+        else if (TOUCH_SCREEN_STANDBY_PIN != INVALID_GPIO)
         {
              ret = gpio_request(TOUCH_SCREEN_STANDBY_PIN, NULL);
              if(ret != 0)