From bdbe53212f2ab2274e59d598d1148a8636a236d3 Mon Sep 17 00:00:00 2001 From: Hans Verkuil Date: Sun, 8 Mar 2009 10:35:23 -0300 Subject: [PATCH] --- yaml --- r: 138125 b: refs/heads/master c: 9f1a693f76700018d921cd7af86f7c994a300613 h: refs/heads/master i: 138123: 358c40f6f1dc83b64774a0772f4f810d47fde6f5 v: v3 --- [refs] | 2 +- trunk/drivers/media/video/v4l2-ioctl.c | 9 +++++---- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index af71fea3d9ed..755ab3c73d06 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 501cd11a34cd29e20f040bfd8a9e2b6fe6908c91 +refs/heads/master: 9f1a693f76700018d921cd7af86f7c994a300613 diff --git a/trunk/drivers/media/video/v4l2-ioctl.c b/trunk/drivers/media/video/v4l2-ioctl.c index df8d1ff1a577..54ba6b0b951f 100644 --- a/trunk/drivers/media/video/v4l2-ioctl.c +++ b/trunk/drivers/media/video/v4l2-ioctl.c @@ -1796,11 +1796,12 @@ static long __video_do_ioctl(struct file *file, static unsigned long cmd_input_size(unsigned int cmd) { /* Size of structure up to and including 'field' */ -#define CMDINSIZE(cmd, type, field) case _IOC_NR(VIDIOC_##cmd): return \ - offsetof(struct v4l2_##type, field) + \ - sizeof(((struct v4l2_##type *)0)->field); +#define CMDINSIZE(cmd, type, field) \ + case VIDIOC_##cmd: \ + return offsetof(struct v4l2_##type, field) + \ + sizeof(((struct v4l2_##type *)0)->field); - switch (_IOC_NR(cmd)) { + switch (cmd) { CMDINSIZE(ENUM_FMT, fmtdesc, type); CMDINSIZE(G_FMT, format, type); CMDINSIZE(QUERYBUF, buffer, type);