summaryrefslogtreecommitdiff
path: root/linux/drivers/media
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@infradead.org>2007-08-30 15:20:38 +0300
committerMauro Carvalho Chehab <mchehab@infradead.org>2007-08-30 15:20:38 +0300
commit321bf23a60b8284799d4c482c2ecc461cacd7235 (patch)
tree4d9a8b3550d78fb538f34a25c50a24999830c15e /linux/drivers/media
parent96308f3d1acc7260678985b9009e94ba0305ebc2 (diff)
downloadmediapointer-dvb-s2-321bf23a60b8284799d4c482c2ecc461cacd7235.tar.gz
mediapointer-dvb-s2-321bf23a60b8284799d4c482c2ecc461cacd7235.tar.bz2
V4L: Int if: add vidioc_int_g_ifparm, other updates.
From: Sakari Ailus <sakari.ailus@nokia.com> 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 'linux/drivers/media')
-rw-r--r--linux/drivers/media/video/v4l2-int-device.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/linux/drivers/media/video/v4l2-int-device.c b/linux/drivers/media/video/v4l2-int-device.c
index 9d76d1b90..afb2a651f 100644
--- a/linux/drivers/media/video/v4l2-int-device.c
+++ b/linux/drivers/media/video/v4l2-int-device.c
@@ -151,7 +151,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)
@@ -163,5 +163,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);
}