diff options
| author | Patrick Boettcher <pboettcher@kernellabs.com> | 2009-08-17 09:34:41 +0200 |
|---|---|---|
| committer | Patrick Boettcher <pboettcher@kernellabs.com> | 2009-08-17 09:34:41 +0200 |
| commit | 0dc1c1447192743fcb90d7e51d3e5fab897b5388 (patch) | |
| tree | e2855561db510382fb736bdc8ebe5f15af4e816b /linux/drivers/media/video/gspca | |
| parent | beae3fdb4940243ca65c75fea541535237e8e280 (diff) | |
| parent | d0e71c5a86eeb98ca96d280c22b030e9877c3520 (diff) | |
| download | mediapointer-dvb-s2-0dc1c1447192743fcb90d7e51d3e5fab897b5388.tar.gz mediapointer-dvb-s2-0dc1c1447192743fcb90d7e51d3e5fab897b5388.tar.bz2 | |
merge: from main
From: Patrick Boettcher <pboettcher@kernellabs.com>
merge: from main
Priority: normal
Signed-off-by: Patrick Boettcher <pboettcher@kernellabs.com>
Diffstat (limited to 'linux/drivers/media/video/gspca')
| -rw-r--r-- | linux/drivers/media/video/gspca/Kconfig | 8 | ||||
| -rw-r--r-- | linux/drivers/media/video/gspca/gspca.c | 7 | ||||
| -rw-r--r-- | linux/drivers/media/video/gspca/m5602/m5602_s5k83a.c | 4 | ||||
| -rw-r--r-- | linux/drivers/media/video/gspca/vc032x.c | 4 |
4 files changed, 9 insertions, 14 deletions
diff --git a/linux/drivers/media/video/gspca/Kconfig b/linux/drivers/media/video/gspca/Kconfig index 34f46f2bc..a14561956 100644 --- a/linux/drivers/media/video/gspca/Kconfig +++ b/linux/drivers/media/video/gspca/Kconfig @@ -113,10 +113,10 @@ config USB_GSPCA_SN9C20X module will be called gspca_sn9c20x. config USB_GSPCA_SN9C20X_EVDEV - bool "Enable evdev support" - depends on USB_GSPCA_SN9C20X - ---help--- - Say Y here in order to enable evdev support for sn9c20x webcam button. + bool "Enable evdev support" + depends on USB_GSPCA_SN9C20X + ---help--- + Say Y here in order to enable evdev support for sn9c20x webcam button. config USB_GSPCA_SONIXB tristate "SONIX Bayer USB Camera Driver" 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/m5602/m5602_s5k83a.c b/linux/drivers/media/video/gspca/m5602/m5602_s5k83a.c index 7127321ac..6b89f33a4 100644 --- a/linux/drivers/media/video/gspca/m5602/m5602_s5k83a.c +++ b/linux/drivers/media/video/gspca/m5602/m5602_s5k83a.c @@ -178,8 +178,10 @@ sensor_found: sens_priv->settings = kmalloc(sizeof(s32)*ARRAY_SIZE(s5k83a_ctrls), GFP_KERNEL); - if (!sens_priv->settings) + if (!sens_priv->settings) { + kfree(sens_priv); return -ENOMEM; + } sd->gspca_dev.cam.cam_mode = s5k83a_modes; sd->gspca_dev.cam.nmodes = ARRAY_SIZE(s5k83a_modes); 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: |