diff options
| author | Kees Cook <keescook@chromium.org> | 2016-07-25 22:50:36 +0200 |
|---|---|---|
| committer | Kees Cook <keescook@chromium.org> | 2016-07-25 22:50:36 +0200 |
| commit | 74e630a7582e6b3cb39559d712a0049f08dea8a0 (patch) | |
| tree | 98a752412dcfc74d802024c1d9e8c541b93174f9 /drivers/gpio/gpio-104-dio-48e.c | |
| parent | pstore/ram: add Device Tree bindings (diff) | |
| parent | Linux 4.7 (diff) | |
| download | linux-74e630a7582e6b3cb39559d712a0049f08dea8a0.tar.xz linux-74e630a7582e6b3cb39559d712a0049f08dea8a0.zip | |
Merge tag 'v4.7' into for-linus/pstore
Linux 4.7
Diffstat (limited to 'drivers/gpio/gpio-104-dio-48e.c')
| -rw-r--r-- | drivers/gpio/gpio-104-dio-48e.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpio/gpio-104-dio-48e.c b/drivers/gpio/gpio-104-dio-48e.c index 1a647c07be67..fcf776971ca9 100644 --- a/drivers/gpio/gpio-104-dio-48e.c +++ b/drivers/gpio/gpio-104-dio-48e.c @@ -75,7 +75,7 @@ static int dio48e_gpio_direction_input(struct gpio_chip *chip, unsigned offset) { struct dio48e_gpio *const dio48egpio = gpiochip_get_data(chip); const unsigned io_port = offset / 8; - const unsigned control_port = io_port / 2; + const unsigned int control_port = io_port / 3; const unsigned control_addr = dio48egpio->base + 3 + control_port*4; unsigned long flags; unsigned control; @@ -115,7 +115,7 @@ static int dio48e_gpio_direction_output(struct gpio_chip *chip, unsigned offset, { struct dio48e_gpio *const dio48egpio = gpiochip_get_data(chip); const unsigned io_port = offset / 8; - const unsigned control_port = io_port / 2; + const unsigned int control_port = io_port / 3; const unsigned mask = BIT(offset % 8); const unsigned control_addr = dio48egpio->base + 3 + control_port*4; const unsigned out_port = (io_port > 2) ? io_port + 1 : io_port; |