diff options
author | Borislav Petkov <bp@suse.de> | 2016-11-23 21:13:40 +0100 |
---|---|---|
committer | Borislav Petkov <bp@suse.de> | 2016-11-23 21:13:40 +0100 |
commit | 627bc29ed90ca50dbf7a4e7b43c267a2920bbadb (patch) | |
tree | 838d8aca5a04166b6ad74a2ef0f5291224768501 /drivers/tty/serial/sc16is7xx.c | |
parent | 044e7a414be9ba20826e5fd482214686193fe7b6 (diff) | |
parent | 3f5a7896a5096fd50030a04d4c3f28a7441e30a5 (diff) | |
download | op-kernel-dev-627bc29ed90ca50dbf7a4e7b43c267a2920bbadb.zip op-kernel-dev-627bc29ed90ca50dbf7a4e7b43c267a2920bbadb.tar.gz |
Merge tip:ras/core to pick up dependent changes
tip:ras/core contains the respective Fam17h x86 RAS bits which
amd64_edac is going to use. So merge it into the EDAC branch.
Signed-off-by: Borislav Petkov <bp@suse.de>
Diffstat (limited to 'drivers/tty/serial/sc16is7xx.c')
-rw-r--r-- | drivers/tty/serial/sc16is7xx.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/drivers/tty/serial/sc16is7xx.c b/drivers/tty/serial/sc16is7xx.c index 2675792..fb06725 100644 --- a/drivers/tty/serial/sc16is7xx.c +++ b/drivers/tty/serial/sc16is7xx.c @@ -1130,9 +1130,13 @@ static int sc16is7xx_gpio_direction_output(struct gpio_chip *chip, { struct sc16is7xx_port *s = gpiochip_get_data(chip); struct uart_port *port = &s->p[0].port; + u8 state = sc16is7xx_port_read(port, SC16IS7XX_IOSTATE_REG); - sc16is7xx_port_update(port, SC16IS7XX_IOSTATE_REG, BIT(offset), - val ? BIT(offset) : 0); + if (val) + state |= BIT(offset); + else + state &= ~BIT(offset); + sc16is7xx_port_write(port, SC16IS7XX_IOSTATE_REG, state); sc16is7xx_port_update(port, SC16IS7XX_IODIR_REG, BIT(offset), BIT(offset)); |