From: Aaron Sierra <asierra@xes-inc.com>
Date: Sat, 8 Feb 2014 01:23:04 +0000 (-0600)
Subject: gpio: pca953x: Fix gpio_base may not default to -1
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=2b1f597f7f40f8f289489eaa1a973254afc2a632;p=linux-beck.git

gpio: pca953x: Fix gpio_base may not default to -1

If no device tree node existed for a device when CONFIG_OF_GPIO was
defined, then gpio_base would not default to -1.

Signed-off-by: Aaron Sierra <asierra@xes-inc.com>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
---

diff --git a/drivers/gpio/gpio-pca953x.c b/drivers/gpio/gpio-pca953x.c
index 948a0741c221..d550d8e58705 100644
--- a/drivers/gpio/gpio-pca953x.c
+++ b/drivers/gpio/gpio-pca953x.c
@@ -627,11 +627,12 @@ pca953x_get_alt_pdata(struct i2c_client *client, int *gpio_base, u32 *invert)
 	const __be32 *val;
 	int size;
 
+	*gpio_base = -1;
+
 	node = client->dev.of_node;
 	if (node == NULL)
 		return;
 
-	*gpio_base = -1;
 	val = of_get_property(node, "linux,gpio-base", &size);
 	WARN(val, "%s: device-tree property 'linux,gpio-base' is deprecated!", __func__);
 	if (val) {