diff --git a/[refs] b/[refs] index b1f43937f6ac..40ea48ee083c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 473c653fff8dc6a63cad279a8e83395ead12119d +refs/heads/master: 8509a29ec6050a03d88f2da59fc2e361f6c16534 diff --git a/trunk/drivers/media/video/arv.c b/trunk/drivers/media/video/arv.c index 2666d3b76630..19e9929ffa0f 100644 --- a/trunk/drivers/media/video/arv.c +++ b/trunk/drivers/media/video/arv.c @@ -441,7 +441,7 @@ static int ar_do_ioctl(struct inode *inode, struct file *file, { struct video_window *w = arg; DEBUG(1, "VIDIOCGWIN:\n"); - memset(w, 0, sizeof(w)); + memset(w, 0, sizeof(*w)); w->width = ar->width; w->height = ar->height; return 0;