OSDN Git Service

gpio: pcie-idio-24: Fix IRQ Enable Register value
authorArnaud de Turckheim <quarium@gmail.com>
Wed, 4 Nov 2020 15:24:54 +0000 (16:24 +0100)
committerBartosz Golaszewski <bgolaszewski@baylibre.com>
Fri, 6 Nov 2020 14:18:58 +0000 (15:18 +0100)
This fixes the COS Enable Register value for enabling/disabling the
corresponding IRQs bank.

Fixes: 585562046628 ("gpio: Add GPIO support for the ACCES PCIe-IDIO-24 family")
Cc: stable@vger.kernel.org
Signed-off-by: Arnaud de Turckheim <quarium@gmail.com>
Reviewed-by: William Breathitt Gray <vilhelm.gray@gmail.com>
Signed-off-by: Bartosz Golaszewski <bgolaszewski@baylibre.com>
drivers/gpio/gpio-pcie-idio-24.c

index 5ea5174..a61de14 100644 (file)
@@ -334,13 +334,13 @@ static void idio_24_irq_mask(struct irq_data *data)
        unsigned long flags;
        const unsigned long bit_offset = irqd_to_hwirq(data) - 24;
        unsigned char new_irq_mask;
-       const unsigned long bank_offset = bit_offset/8 * 8;
+       const unsigned long bank_offset = bit_offset / 8;
        unsigned char cos_enable_state;
 
        raw_spin_lock_irqsave(&idio24gpio->lock, flags);
 
        idio24gpio->irq_mask &= ~BIT(bit_offset);
-       new_irq_mask = idio24gpio->irq_mask >> bank_offset;
+       new_irq_mask = idio24gpio->irq_mask >> bank_offset * 8;
 
        if (!new_irq_mask) {
                cos_enable_state = ioread8(&idio24gpio->reg->cos_enable);
@@ -363,12 +363,12 @@ static void idio_24_irq_unmask(struct irq_data *data)
        unsigned long flags;
        unsigned char prev_irq_mask;
        const unsigned long bit_offset = irqd_to_hwirq(data) - 24;
-       const unsigned long bank_offset = bit_offset/8 * 8;
+       const unsigned long bank_offset = bit_offset / 8;
        unsigned char cos_enable_state;
 
        raw_spin_lock_irqsave(&idio24gpio->lock, flags);
 
-       prev_irq_mask = idio24gpio->irq_mask >> bank_offset;
+       prev_irq_mask = idio24gpio->irq_mask >> bank_offset * 8;
        idio24gpio->irq_mask |= BIT(bit_offset);
 
        if (!prev_irq_mask) {