aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/video/zoran
diff options
context:
space:
mode:
authorHans Verkuil <hverkuil@xs4all.nl>2009-03-14 11:53:37 -0400
committerMauro Carvalho Chehab <mchehab@redhat.com>2009-03-30 11:43:23 -0400
commit33470423aba5da982dc944658da232942824f2d5 (patch)
tree73e3d35950e064c3d29eec5df7ca31e8e9578f1f /drivers/media/video/zoran
parent9467fe126451c7fc7878d21f3cd1938421ef972e (diff)
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>
Diffstat (limited to 'drivers/media/video/zoran')
-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,
1196 return m; 1196 return m;
1197} 1197}
1198 1198
1199static int zoran_subdev_notify(struct v4l2_subdev *sd, unsigned int cmd, void *arg) 1199static void zoran_subdev_notify(struct v4l2_subdev *sd, unsigned int cmd, void *arg)
1200{ 1200{
1201 struct zoran *zr = to_zoran(sd->v4l2_dev); 1201 struct zoran *zr = to_zoran(sd->v4l2_dev);
1202 1202
@@ -1206,7 +1206,6 @@ static int zoran_subdev_notify(struct v4l2_subdev *sd, unsigned int cmd, void *a
1206 GPIO(zr, 7, 0); 1206 GPIO(zr, 7, 0);
1207 else if (cmd == BT819_FIFO_RESET_HIGH) 1207 else if (cmd == BT819_FIFO_RESET_HIGH)
1208 GPIO(zr, 7, 1); 1208 GPIO(zr, 7, 1);
1209 return 0;
1210} 1209}
1211 1210
1212/* 1211/*