diff options
| author | Alexandre Courbot <acourbot@nvidia.com> | 2013-11-19 02:37:29 +0100 |
|---|---|---|
| committer | Linus Walleij <linus.walleij@linaro.org> | 2013-11-25 09:03:13 +0100 |
| commit | 209e64f9ed28e4e686c3dfb0ed89069849d679c6 (patch) | |
| tree | 0e44447ae705616647e97824550a656ceb4fe6e4 /drivers | |
| parent | gpio: fix memory leak in error path (diff) | |
| download | linux-209e64f9ed28e4e686c3dfb0ed89069849d679c6.tar.xz linux-209e64f9ed28e4e686c3dfb0ed89069849d679c6.zip | |
gpiolib: fix of_find_gpio() when OF not defined
The prototype for static GPIO lookup functions has been updated to use
an explicit type for GPIO lookup flags. Unfortunately the definition of
of_find_gpio() when CONFIG_OF is not defined has been omitted, which
triggers a warning. This patch fixes this.
Signed-off-by: Alexandre Courbot <acourbot@nvidia.com>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/gpio/gpiolib.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/gpio/gpiolib.c b/drivers/gpio/gpiolib.c index 14ab16fbaad5..ac53a9593662 100644 --- a/drivers/gpio/gpiolib.c +++ b/drivers/gpio/gpiolib.c @@ -2302,7 +2302,8 @@ static struct gpio_desc *of_find_gpio(struct device *dev, const char *con_id, } #else static struct gpio_desc *of_find_gpio(struct device *dev, const char *con_id, - unsigned int idx, unsigned long *flags) + unsigned int idx, + enum gpio_lookup_flags *flags) { return ERR_PTR(-ENODEV); } |