V4L/DVB (13750): [Mantis] GPIO_CONTROL: Cache a given GPIO Bit Setup for a given event

Signed-off-by: Manu Abraham <manu@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>

2 files changed, 6 insertions, 7 deletions

diff --git a/drivers/media/dvb/mantis/mantis_common.h b/drivers/media/dvb/mantis/mantis_common.h
index 0aa4001dea9c..75f07736e001 100644
--- a/drivers/media/dvb/mantis/mantis_common.h
+++ b/drivers/media/dvb/mantis/mantis_common.h
@@ -137,7 +137,7 @@ struct mantis_pci {
         u32                     sub_device_id;
 
          /*     A12 A13 A14             */
-        int                     gpio_status;
+        u32                     gpio_status;
 
         struct mantis_ca        *mantis_ca;
 };
diff --git a/drivers/media/dvb/mantis/mantis_core.c b/drivers/media/dvb/mantis/mantis_core.c
index b94d0515de4b..3fd3b0801cf4 100644
--- a/drivers/media/dvb/mantis/mantis_core.c
+++ b/drivers/media/dvb/mantis/mantis_core.c
@@ -185,16 +185,15 @@ int mantis_core_exit(struct mantis_pci *mantis)
 // Turn the given bit on or off.
 void gpio_set_bits(struct mantis_pci *mantis, u32 bitpos, u8 value)
 {
-        u32 currVal, newVal;
-
-        currVal = mmread(MANTIS_GPIF_ADDR);
+        u32 cur;
 
+        cur = mmread(MANTIS_GPIF_ADDR);
         if (value)
-                newVal = currVal | (1 << bitpos);
+                mantis->gpio_status = cur | (1 << bitpos);
         else
-                newVal = currVal & (~(1 << bitpos));
+                mantis->gpio_status = cur & (~(1 << bitpos));
 
-        mmwrite(newVal, MANTIS_GPIF_ADDR);
+        mmwrite(mantis->gpio_status, MANTIS_GPIF_ADDR);
         mmwrite(0x00, MANTIS_GPIF_DOUT);
         udelay(100);
 }