Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit aaf96e51 authored by William Breathitt Gray's avatar William Breathitt Gray Committed by Linus Walleij
Browse files

gpio: pci-idio-16: Fix port memory offset for get_multiple callback 



The ioread8 function expects a memory offset argument. This patch fixes
the ports array to provide the memory addresses of the respective device
I/O registers.

Fixes: 810ebfc5 ("gpio: pci-idio-16: Implement get_multiple callback")
Signed-off-by: default avatarWilliam Breathitt Gray <vilhelm.gray@gmail.com>
Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
parent f001cc35

drivers/gpio/gpio-pci-idio-16.c

+4 −4
Original line number Diff line number Diff line
@@ -116,9 +116,9 @@ static int idio_16_gpio_get_multiple(struct gpio_chip *chip, 
	unsigned long word_mask;

	const unsigned long port_mask = GENMASK(gpio_reg_size - 1, 0);

	unsigned long port_state;

	u8 __iomem ports[] = {

		idio16gpio->reg->out0_7, idio16gpio->reg->out8_15,

		idio16gpio->reg->in0_7, idio16gpio->reg->in8_15,

	void __iomem *ports[] = {

		&idio16gpio->reg->out0_7, &idio16gpio->reg->out8_15,

		&idio16gpio->reg->in0_7, &idio16gpio->reg->in8_15,

	};



	/* clear bits array to a clean slate */
@@ -143,7 +143,7 @@ static int idio_16_gpio_get_multiple(struct gpio_chip *chip, 
		}



		/* read bits from current gpio port */

		port_state = ioread8(ports + i);

		port_state = ioread8(ports[i]);



		/* store acquired bits at respective bits array offset */

		bits[word_index] |= port_state << word_offset;