diff options
| author | Max Thrun | 2010-02-27 21:20:25 +0100 |
|---|---|---|
| committer | Mauro Carvalho Chehab | 2010-05-18 05:46:58 +0200 |
| commit | eb171073b6f941e83f01b6444ab347e893785faf (patch) | |
| tree | 44e75072e047e799f23e96a395a358138d3ec72b /drivers | |
| parent | V4L/DVB: gspca - ov534: Fixes for sharpness control (diff) | |
| download | kernel-qcow2-linux-eb171073b6f941e83f01b6444ab347e893785faf.tar.gz kernel-qcow2-linux-eb171073b6f941e83f01b6444ab347e893785faf.tar.xz kernel-qcow2-linux-eb171073b6f941e83f01b6444ab347e893785faf.zip | |
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>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/media/video/gspca/ov534.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/drivers/media/video/gspca/ov534.c b/drivers/media/video/gspca/ov534.c index f2077eaa619c..8f01201956c1 100644 --- 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; } |