diff options
| author | Mark Brown <broonie@kernel.org> | 2026-10-01 15:39:33 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2026-10-01 15:39:33 +0100 |
| commit | 10f2aa893a9d9c105cc732b896e54581be0334da (patch) | |
| tree | 659041780d5fad8f60b15da15b5efcea03a9569f | |
| parent | 91d5d4a52a966b84ace2be4f41e227c0062b7d50 (diff) | |
| parent | 0fc424b6a8ef447450f6087db42abce3a6feb328 (diff) | |
| download | linux-next-10f2aa893a9d9c105cc732b896e54581be0334da.tar.gz linux-next-10f2aa893a9d9c105cc732b896e54581be0334da.zip | |
Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/andy/linux-gpio-intel.git
| -rw-r--r-- | drivers/gpio/gpio-wcove.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/drivers/gpio/gpio-wcove.c b/drivers/gpio/gpio-wcove.c index 4a5e20e936a9..937c5db7e6e4 100644 --- a/drivers/gpio/gpio-wcove.c +++ b/drivers/gpio/gpio-wcove.c @@ -129,10 +129,7 @@ static void wcove_update_irq_mask(struct wcove_gpio *wg, irq_hw_number_t gpio) { unsigned int mask, reg = to_ireg(gpio, IRQ_MASK, &mask); - if (wg->set_irq_mask) - regmap_set_bits(wg->regmap, reg, mask); - else - regmap_clear_bits(wg->regmap, reg, mask); + regmap_assign_bits(wg->regmap, reg, mask, wg->set_irq_mask); } static void wcove_update_irq_ctrl(struct wcove_gpio *wg, irq_hw_number_t gpio) |