summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHans Verkuil <hverkuil@xs4all.nl>2009-03-14 16:53:37 +0100
committerMauro Carvalho Chehab <mchehab@redhat.com>2009-03-30 17:43:23 +0200
commit33470423aba5da982dc944658da232942824f2d5 (patch)
tree73e3d35950e064c3d29eec5df7ca31e8e9578f1f
parentV4L/DVB (11047): cx88: convert to v4l2_device. (diff)
downloadlinux-33470423aba5da982dc944658da232942824f2d5.tar.xz
linux-33470423aba5da982dc944658da232942824f2d5.zip
V4L/DVB (11048): zoran: fix incorrect return type of notify function.
Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
-rw-r--r--drivers/media/video/zoran/zoran_card.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/media/video/zoran/zoran_card.c b/drivers/media/video/zoran/zoran_card.c
index ec9b6ef56090..f91bba435ed5 100644
--- a/drivers/media/video/zoran/zoran_card.c
+++ b/drivers/media/video/zoran/zoran_card.c
@@ -1196,7 +1196,7 @@ zoran_setup_videocodec (struct zoran *zr,
return m;
}
-static int zoran_subdev_notify(struct v4l2_subdev *sd, unsigned int cmd, void *arg)
+static void zoran_subdev_notify(struct v4l2_subdev *sd, unsigned int cmd, void *arg)
{
struct zoran *zr = to_zoran(sd->v4l2_dev);
@@ -1206,7 +1206,6 @@ static int zoran_subdev_notify(struct v4l2_subdev *sd, unsigned int cmd, void *a
GPIO(zr, 7, 0);
else if (cmd == BT819_FIFO_RESET_HIGH)
GPIO(zr, 7, 1);
- return 0;
}
/*