diff options
| author | Alexandre Courbot | 2013-12-03 04:31:11 +0100 |
|---|---|---|
| committer | Linus Walleij | 2013-12-04 13:45:29 +0100 |
| commit | b7d0a28a9f65c4f8a547ceece820b8167a854968 (patch) | |
| tree | 37176b7a2ccf808cdfc4a4c03be778b6e0980044 /drivers/gpio/gpiolib.c | |
| parent | gpio: MOXA ART: rename moxart_gpio_base to base (diff) | |
| download | kernel-qcow2-linux-b7d0a28a9f65c4f8a547ceece820b8167a854968.tar.gz kernel-qcow2-linux-b7d0a28a9f65c4f8a547ceece820b8167a854968.tar.xz kernel-qcow2-linux-b7d0a28a9f65c4f8a547ceece820b8167a854968.zip | |
gpio: rewrite gpiochip_offset_to_desc()
gpiochip_offset_to_desc() was using gpio_to_desc(), which directly
addresses the global GPIO array we are hoping to get rid of someday.
Reimplement it using the descriptor array of the chip itself, after
checking the requested offset is within the valid bounds of the chip.
Signed-off-by: Alexandre Courbot <acourbot@nvidia.com>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Diffstat (limited to 'drivers/gpio/gpiolib.c')
| -rw-r--r-- | drivers/gpio/gpiolib.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/gpio/gpiolib.c b/drivers/gpio/gpiolib.c index 4e10b10d3ddd..c6326e44e2c0 100644 --- a/drivers/gpio/gpiolib.c +++ b/drivers/gpio/gpiolib.c @@ -150,9 +150,10 @@ EXPORT_SYMBOL_GPL(gpio_to_desc); static struct gpio_desc *gpiochip_offset_to_desc(struct gpio_chip *chip, unsigned int offset) { - unsigned int gpio = chip->base + offset; + if (offset >= chip->ngpio) + return ERR_PTR(-EINVAL); - return gpio_to_desc(gpio); + return &chip->desc[offset]; } /** |