V4L/DVB (13718): [Mantis] Use gpio_set_bits to turn OFF the bits as well

Signed-off-by: Marko Ristola <marko.ristola@kolumbus.fi>
Signed-off-by: Manu Abraham <manu@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>

diff --git a/drivers/media/dvb/mantis/mantis_core.c b/drivers/media/dvb/mantis/mantis_core.c
index d159ad6fc321f06129acae66472bf0e765a37900..16d693eeb29edc53d3c24edfd36e9c90a1e87515 100644 (file)
--- a/drivers/media/dvb/mantis/mantis_core.c
+++ b/drivers/media/dvb/mantis/mantis_core.c
@@ -172,25 +172,23 @@ int mantis_core_exit(struct mantis_pci *mantis)
        return 0;
 }
 
+// Turn the given bit on or off.
 void gpio_set_bits(struct mantis_pci *mantis, u32 bitpos, u8 value)
 {
-       u32 reg;
+       u32 currVal, newVal;
+
+       currVal = mmread(MANTIS_GPIF_ADDR);
 
        if (value)
-               reg = 0x0000;
+               newVal = currVal | (1 << bitpos);
        else
-               reg = 0xffff;
-
-       reg = (value << bitpos);
+               newVal = currVal & (~(1 << bitpos));
 
-       mmwrite(mmread(MANTIS_GPIF_ADDR) | reg, MANTIS_GPIF_ADDR);
+       mmwrite(newVal, MANTIS_GPIF_ADDR);
        mmwrite(0x00, MANTIS_GPIF_DOUT);
        udelay(100);
-       mmwrite(mmread(MANTIS_GPIF_ADDR) | reg, MANTIS_GPIF_ADDR);
-       mmwrite(0x00, MANTIS_GPIF_DOUT);
 }
 
-
 //direction = 0 , no CI passthrough ; 1 , CI passthrough
 void mantis_set_direction(struct mantis_pci *mantis, int direction)
 {