diff options
| author | Jean-Francois Moine <moinejf@free.fr> | 2009-08-05 11:58:27 +0200 |
|---|---|---|
| committer | Jean-Francois Moine <moinejf@free.fr> | 2009-08-05 11:58:27 +0200 |
| commit | 0205500e6618084b21d9c12d4e4494e026d4239c (patch) | |
| tree | b4ef85d09d8aef87f687870ba827a2a44fd19924 | |
| parent | 84b33bda3d8447bc0f28a9eae22039ec4a0bb3bf (diff) | |
| parent | 0315e4babbc90dd9a89e82968fd924cae514d993 (diff) | |
| download | mediapointer-dvb-s2-0205500e6618084b21d9c12d4e4494e026d4239c.tar.gz mediapointer-dvb-s2-0205500e6618084b21d9c12d4e4494e026d4239c.tar.bz2 | |
merge: v4l-dvb
| -rw-r--r-- | linux/drivers/media/video/gspca/gspca.c | 7 | ||||
| -rw-r--r-- | linux/drivers/media/video/gspca/vc032x.c | 4 |
2 files changed, 2 insertions, 9 deletions
diff --git a/linux/drivers/media/video/gspca/gspca.c b/linux/drivers/media/video/gspca/gspca.c index 2e5197073..670091e42 100644 --- a/linux/drivers/media/video/gspca/gspca.c +++ b/linux/drivers/media/video/gspca/gspca.c @@ -1504,12 +1504,6 @@ static int vidioc_s_parm(struct file *filp, void *priv, return 0; } -static int vidioc_s_std(struct file *filp, void *priv, - v4l2_std_id *parm) -{ - return 0; -} - #ifdef CONFIG_VIDEO_V4L1_COMPAT static int vidiocgmbuf(struct file *file, void *priv, struct video_mbuf *mbuf) @@ -1980,7 +1974,6 @@ static const struct v4l2_ioctl_ops dev_ioctl_ops = { .vidioc_s_jpegcomp = vidioc_s_jpegcomp, .vidioc_g_parm = vidioc_g_parm, .vidioc_s_parm = vidioc_s_parm, - .vidioc_s_std = vidioc_s_std, .vidioc_enum_framesizes = vidioc_enum_framesizes, #ifdef CONFIG_VIDEO_ADV_DEBUG .vidioc_g_register = vidioc_g_register, diff --git a/linux/drivers/media/video/gspca/vc032x.c b/linux/drivers/media/video/gspca/vc032x.c index 44dea7949..6f9aab89c 100644 --- a/linux/drivers/media/video/gspca/vc032x.c +++ b/linux/drivers/media/video/gspca/vc032x.c @@ -3135,10 +3135,10 @@ static void sethvflip(struct gspca_dev *gspca_dev) hflip = sd->hflip; if (sd->flags & FL_HFLIP) - hflip != hflip; + hflip = !hflip; vflip = sd->vflip; if (sd->flags & FL_VFLIP) - vflip != vflip; + vflip = !vflip; switch (sd->sensor) { case SENSOR_MI1310_SOC: case SENSOR_MI1320_SOC: |