summaryrefslogtreecommitdiff
path: root/linux/drivers/media/video/pwc
diff options
context:
space:
mode:
Diffstat (limited to 'linux/drivers/media/video/pwc')
-rw-r--r--linux/drivers/media/video/pwc/pwc-dec23.c2
-rw-r--r--linux/drivers/media/video/pwc/pwc-v4l.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/linux/drivers/media/video/pwc/pwc-dec23.c b/linux/drivers/media/video/pwc/pwc-dec23.c
index f9096c72c..39eaf5839 100644
--- a/linux/drivers/media/video/pwc/pwc-dec23.c
+++ b/linux/drivers/media/video/pwc/pwc-dec23.c
@@ -882,7 +882,7 @@ void pwc_dec23_decompress(const struct pwc_device *pwc,
}
#else
- memcpy(dst, 0, pwc->view.x * pwc->view.y);
+ memset(dst, 0, pwc->view.x * pwc->view.y);
#endif
} else {
diff --git a/linux/drivers/media/video/pwc/pwc-v4l.c b/linux/drivers/media/video/pwc/pwc-v4l.c
index 961ce2ddf..df4bbdb1e 100644
--- a/linux/drivers/media/video/pwc/pwc-v4l.c
+++ b/linux/drivers/media/video/pwc/pwc-v4l.c
@@ -127,7 +127,7 @@ static struct v4l2_queryctrl pwc_controls[] = {
.step = 1,
.default_value = 0,
},
-#if XAWTV_HAS_BEEN_FIXED
+#ifndef BROKEN_XAWTV
{
.id = V4L2_CID_PRIVATE_SAVE_USER,
.type = V4L2_CTRL_TYPE_BUTTON,