From 365c43a309e59c8d9dd8dcd5bac344e5e9895eb7 Mon Sep 17 00:00:00 2001 From: Hans Verkuil Date: Sat, 14 Mar 2009 12:53:37 -0300 Subject: [PATCH] --- yaml --- r: 138185 b: refs/heads/master c: 33470423aba5da982dc944658da232942824f2d5 h: refs/heads/master i: 138183: 3a4d62445e1e60e0bf8a9471539a0b135cb6c573 v: v3 --- [refs] | 2 +- trunk/drivers/media/video/zoran/zoran_card.c | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 8a848ac7e3e7..83699ed44563 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 9467fe126451c7fc7878d21f3cd1938421ef972e +refs/heads/master: 33470423aba5da982dc944658da232942824f2d5 diff --git a/trunk/drivers/media/video/zoran/zoran_card.c b/trunk/drivers/media/video/zoran/zoran_card.c index ec9b6ef56090..f91bba435ed5 100644 --- a/trunk/drivers/media/video/zoran/zoran_card.c +++ b/trunk/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; } /*