From: Max Thrun <bear2...@gmail.com>

Also set default values unconditionally, for readability.

Signed-off-by: Max Thrun <bear2...@gmail.com>
Signed-off-by: Antonio Ospite <osp...@studenti.unina.it>
---
 linux/drivers/media/video/gspca/ov534.c |    8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

Index: gspca/linux/drivers/media/video/gspca/ov534.c
===================================================================
--- gspca.orig/linux/drivers/media/video/gspca/ov534.c
+++ gspca/linux/drivers/media/video/gspca/ov534.c
@@ -764,7 +764,7 @@
                                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)
@@ -776,7 +776,7 @@
                                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 */
@@ -810,12 +810,8 @@
        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;
 }
--
To unsubscribe from this list: send the line "unsubscribe linux-media" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to