V4L/DVB: gspca - ov534: Fix unsetting hflip and vflip bits

Also set default values unconditionally, for readability.

Signed-off-by: Max Thrun <bear24rw@gmail.com>
Signed-off-by: Antonio Ospite <ospite@studenti.unina.it>
Signed-off-by: Jean-François Moine <moinejf@free.fr>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>

diff --git a/drivers/media/video/gspca/ov534.c b/drivers/media/video/gspca/ov534.c
index f2077eaa619c3ff216ddd1c5af0bf307dd12e60a..8f01201956c1c6b99b7784b49d655205414f4934 100644 (file)
--- a/drivers/media/video/gspca/ov534.c
+++ b/drivers/media/video/gspca/ov534.c
@@ -769,7 +769,7 @@ static void sethflip(struct gspca_dev *gspca_dev)
                                sccb_reg_read(gspca_dev, 0x0c) | 0x40);
        else
                sccb_reg_write(gspca_dev, 0x0c,
-                               sccb_reg_read(gspca_dev, 0x0c) & 0xbf);
+                               sccb_reg_read(gspca_dev, 0x0c) & ~0x40);
 }
 
 static void setvflip(struct gspca_dev *gspca_dev)
@@ -781,7 +781,7 @@ static void setvflip(struct gspca_dev *gspca_dev)
                                sccb_reg_read(gspca_dev, 0x0c) | 0x80);
        else
                sccb_reg_write(gspca_dev, 0x0c,
-                               sccb_reg_read(gspca_dev, 0x0c) & 0x7f);
+                               sccb_reg_read(gspca_dev, 0x0c) & ~0x80);
 }
 
 /* this function is called at probe time */
@@ -815,12 +815,8 @@ static int sd_config(struct gspca_dev *gspca_dev,
        sd->awb = AWB_DEF;
        sd->aec = AEC_DEF;
        sd->sharpness = SHARPNESS_DEF;
-#if HFLIP_DEF != 0
        sd->hflip = HFLIP_DEF;
-#endif
-#if VFLIP_DEF != 0
        sd->vflip = VFLIP_DEF;
-#endif
 
        return 0;
 }