From 4a2dd655c4bf0c49274c7647847d3182f37df7d1 Mon Sep 17 00:00:00 2001 From: Max Thrun Date: Sat, 27 Feb 2010 17:20:25 -0300 Subject: [PATCH] --- yaml --- r: 192793 b: refs/heads/master c: eb171073b6f941e83f01b6444ab347e893785faf h: refs/heads/master i: 192791: 1c682689a0326ec44a61a58280d5c31c8fae9ca9 v: v3 --- [refs] | 2 +- trunk/drivers/media/video/gspca/ov534.c | 8 ++------ 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/[refs] b/[refs] index b23eb16af545..6548aaf66797 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 3149cfbfaca7912995a32d72ddd2381e66ca845e +refs/heads/master: eb171073b6f941e83f01b6444ab347e893785faf diff --git a/trunk/drivers/media/video/gspca/ov534.c b/trunk/drivers/media/video/gspca/ov534.c index f2077eaa619c..8f01201956c1 100644 --- a/trunk/drivers/media/video/gspca/ov534.c +++ b/trunk/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; }