diff mbox

staging/for_v3.6 is currently broken

Message ID CALzAhNVDnyjwNqcWDcgv2kgQ97Hr0gArk8=V_mL62J0cD0Ydag@mail.gmail.com (mailing list archive)
State New, archived
Headers show

Commit Message

Steven Toth July 14, 2012, 10:29 p.m. UTC
Looks like the new union in v4l2_ioctl_info breaks things.

-bash-4.1$ make -j6
make[1]: Nothing to be done for `all'.
  CHK     include/linux/version.h
  CHK     include/generated/utsrelease.h
  CALL    scripts/checksyscalls.sh
  CHK     include/generated/compile.h
  CC      drivers/media/video/v4l2-ioctl.o
drivers/media/video/v4l2-ioctl.c:1848:517: error: unknown field ‘func’
specified in initializer
drivers/media/video/v4l2-ioctl.c:1848:517: warning: missing braces
around initializer
drivers/media/video/v4l2-ioctl.c:1848:517: warning: (near
initialization for ‘v4l2_ioctls[0].<anonymous>’)
drivers/media/video/v4l2-ioctl.c:1848:517: warning: initialization
makes integer from pointer without a cast
drivers/media/video/v4l2-ioctl.c:1849:644: error: unknown field ‘func’
specified in initializer
drivers/media/video/v4l2-ioctl.c:1849:644: warning: initialization
makes integer from pointer without a cast

Removing the union and the code compiles, although that probably
wasn't the original authors intension.

FYI

Comments

Andy Walls July 14, 2012, 10:36 p.m. UTC | #1
Steven Toth <stoth@kernellabs.com> wrote:

>Looks like the new union in v4l2_ioctl_info breaks things.
>
>-bash-4.1$ make -j6
>make[1]: Nothing to be done for `all'.
>  CHK     include/linux/version.h
>  CHK     include/generated/utsrelease.h
>  CALL    scripts/checksyscalls.sh
>  CHK     include/generated/compile.h
>  CC      drivers/media/video/v4l2-ioctl.o
>drivers/media/video/v4l2-ioctl.c:1848:517: error: unknown field ‘func’
>specified in initializer
>drivers/media/video/v4l2-ioctl.c:1848:517: warning: missing braces
>around initializer
>drivers/media/video/v4l2-ioctl.c:1848:517: warning: (near
>initialization for ‘v4l2_ioctls[0].<anonymous>’)
>drivers/media/video/v4l2-ioctl.c:1848:517: warning: initialization
>makes integer from pointer without a cast
>drivers/media/video/v4l2-ioctl.c:1849:644: error: unknown field ‘func’
>specified in initializer
>drivers/media/video/v4l2-ioctl.c:1849:644: warning: initialization
>makes integer from pointer without a cast
>
>Removing the union and the code compiles, although that probably
>wasn't the original authors intension.
>
>diff --git a/drivers/media/video/v4l2-ioctl.c
>b/drivers/media/video/v4l2-ioctl.c
>index 70e0efb..1f090c4 100644
>--- a/drivers/media/video/v4l2-ioctl.c
>+++ b/drivers/media/video/v4l2-ioctl.c
>@@ -1802,11 +1802,9 @@ struct v4l2_ioctl_info {
>        unsigned int ioctl;
>        u32 flags;
>        const char * const name;
>-       union {
>                u32 offset;
>                int (*func)(const struct v4l2_ioctl_ops *ops,
>                                struct file *file, void *fh, void *p);
>-       };
>        void (*debug)(const void *arg, bool write_only);
> };
>
>FYI
>
>-- 
>Steven Toth - Kernel Labs
>http://www.kernellabs.com
>--
>To unsubscribe from this list: send the line "unsubscribe linux-media"
>in
>the body of a message to majordomo@vger.kernel.org
>More majordomo info at  http://vger.kernel.org/majordomo-info.html


I think Hans fixed it another way:

http://www.spinics.net/lists/linux-media/msg50234.html

Regards,
Andy
--
To unsubscribe from this list: send the line "unsubscribe linux-media" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Steven Toth July 14, 2012, 10:38 p.m. UTC | #2
On Sat, Jul 14, 2012 at 6:36 PM, Andy Walls <awalls@md.metrocast.net> wrote:
> Steven Toth <stoth@kernellabs.com> wrote:
>
>>Looks like the new union in v4l2_ioctl_info breaks things.
>
> I think Hans fixed it another way:
>
> http://www.spinics.net/lists/linux-media/msg50234.html

Thanks Andy.
diff mbox

Patch

diff --git a/drivers/media/video/v4l2-ioctl.c b/drivers/media/video/v4l2-ioctl.c
index 70e0efb..1f090c4 100644
--- a/drivers/media/video/v4l2-ioctl.c
+++ b/drivers/media/video/v4l2-ioctl.c
@@ -1802,11 +1802,9 @@  struct v4l2_ioctl_info {
        unsigned int ioctl;
        u32 flags;
        const char * const name;
-       union {
                u32 offset;
                int (*func)(const struct v4l2_ioctl_ops *ops,
                                struct file *file, void *fh, void *p);
-       };
        void (*debug)(const void *arg, bool write_only);
 };