summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrey Konovalov <andrey.konovalov@linaro.org>2012-07-23 21:50:54 +0400
committerAndrey Konovalov <andrey.konovalov@linaro.org>2012-07-23 21:50:54 +0400
commit9bbc57ddebb627567848651c3c66ba6a2b8f33b8 (patch)
treebca98ef20a571c01debdfd8c19e50962bd942455
parent77b6337d26598488c560847e80ffab06a226b925 (diff)
parent053235eb2549d373b5534c16af92c08e241dcb13 (diff)
Merge branch 'tracking-llct-last-minute-fixes' into merge-linux-linaro-core-trackingllct-20120723.1
-rw-r--r--include/linux/of_gpio.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/include/linux/of_gpio.h b/include/linux/of_gpio.h
index 18e015682276..10c2c5a38e4d 100644
--- a/include/linux/of_gpio.h
+++ b/include/linux/of_gpio.h
@@ -70,7 +70,8 @@ struct gpio_chip;
static inline int of_get_named_gpio_flags(struct device_node *np,
const char *list_name, int index, enum of_gpio_flags *flags)
{
- *flags = 0;
+ if (flags)
+ *flags = 0;
return -ENOSYS;
}