diff options
| author | Wolfgang Denk <wd@denx.de> | 2010-06-18 01:20:49 +0200 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2010-06-18 01:20:49 +0200 |
| commit | 54e19a7ded6e9dbdc3392a57d82f4f77b34e85b8 (patch) | |
| tree | 9e796e38d4edeabec4d091ed89d6fe179e84956c /drivers/gpio/s5p_gpio.c | |
| parent | 86caca1cd97ba71b7a7c82f2b0163682df35ce5d (diff) | |
| parent | 1f241263e088a71b8f33f87b03a37c5418d41e2e (diff) | |
| download | u-boot-imx-54e19a7ded6e9dbdc3392a57d82f4f77b34e85b8.zip u-boot-imx-54e19a7ded6e9dbdc3392a57d82f4f77b34e85b8.tar.gz u-boot-imx-54e19a7ded6e9dbdc3392a57d82f4f77b34e85b8.tar.bz2 | |
Merge branch 'master' into next
Conflicts:
Makefile
Signed-off-by: Wolfgang Denk <wd@denx.de>
Diffstat (limited to 'drivers/gpio/s5p_gpio.c')
| -rw-r--r-- | drivers/gpio/s5p_gpio.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpio/s5p_gpio.c b/drivers/gpio/s5p_gpio.c index 0439477..a1bcddc 100644 --- a/drivers/gpio/s5p_gpio.c +++ b/drivers/gpio/s5p_gpio.c @@ -96,7 +96,7 @@ void gpio_set_pull(struct s5p_gpio_bank *bank, int gpio, int mode) value |= PULL_MODE(gpio, mode); break; default: - return; + break; } writel(value, &bank->pull); |