summaryrefslogtreecommitdiffstats
path: root/drivers/media/video/v4l2-int-device.c
diff options
context:
space:
mode:
authorSakari Ailus <sakari.ailus@nokia.com>2007-08-30 14:20:38 +0200
committerMauro Carvalho Chehab <mchehab@infradead.org>2007-10-10 03:14:39 +0200
commit098c645e39e10dc580763b5ea4bd4fb390013474 (patch)
tree25013ceabf3fef962621300495eb379b70efcd1e /drivers/media/video/v4l2-int-device.c
parentV4L/DVB (6215): Bugfix for saa6588.c, add forgotten spin_lock_init() (diff)
downloadlinux-098c645e39e10dc580763b5ea4bd4fb390013474.tar.xz
linux-098c645e39e10dc580763b5ea4bd4fb390013474.zip
V4L/DVB (6216): V4L: Int if: add vidioc_int_g_ifparm, other updates
vidioc_int_g_ifparm can be used to obtain hardware-specific information about the interface used by the slave. Rearrange v4l2-int-device.h as well. Also remove useless & characters. Signed-off-by: Sakari Ailus <sakari.ailus@nokia.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'drivers/media/video/v4l2-int-device.c')
-rw-r--r--drivers/media/video/v4l2-int-device.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/media/video/v4l2-int-device.c b/drivers/media/video/v4l2-int-device.c
index a643730fa3b2..7ad8700ebdea 100644
--- a/drivers/media/video/v4l2-int-device.c
+++ b/drivers/media/video/v4l2-int-device.c
@@ -150,7 +150,7 @@ int v4l2_int_ioctl_0(struct v4l2_int_device *d, int cmd)
{
return ((v4l2_int_ioctl_func_0 *)
find_ioctl(d->u.slave, cmd,
- (v4l2_int_ioctl_func *)&no_such_ioctl_0))(d);
+ (v4l2_int_ioctl_func *)no_such_ioctl_0))(d);
}
static int no_such_ioctl_1(struct v4l2_int_device *d, void *arg)
@@ -162,5 +162,5 @@ int v4l2_int_ioctl_1(struct v4l2_int_device *d, int cmd, void *arg)
{
return ((v4l2_int_ioctl_func_1 *)
find_ioctl(d->u.slave, cmd,
- (v4l2_int_ioctl_func *)&no_such_ioctl_1))(d, arg);
+ (v4l2_int_ioctl_func *)no_such_ioctl_1))(d, arg);
}