1 files changed, 5 insertions, 6 deletions

diff --git a/drivers/gpio/gpio-tegra.c b/drivers/gpio/gpio-tegra.c
index dde0656ea951..da4cb5b0cb87 100644
--- a/drivers/gpio/gpio-tegra.c
+++ b/drivers/gpio/gpio-tegra.c
@@ -414,10 +414,11 @@ static int tegra_gpio_probe(struct platform_device *pdev)
         int j;
 
         match = of_match_device(tegra_gpio_of_match, &pdev->dev);
-        if (match)
-                config = (struct tegra_gpio_soc_config *)match->data;
-        else
-                config = &tegra20_gpio_config;
+        if (!match) {
+                dev_err(&pdev->dev, "Error: No device match found\n");
+                return -ENODEV;
+        }
+        config = (struct tegra_gpio_soc_config *)match->data;
 
         tegra_gpio_bank_stride = config->bank_stride;
         tegra_gpio_upper_offset = config->upper_offset;
@@ -478,9 +479,7 @@ static int tegra_gpio_probe(struct platform_device *pdev)
                 }
         }
 
-#ifdef CONFIG_OF_GPIO
         tegra_gpio_chip.of_node = pdev->dev.of_node;
-#endif
 
         gpiochip_add(&tegra_gpio_chip);