I see the following warning when building the zoran driver:
v4l/zoran_card.c: In function 'zoran_probe':
v4l/zoran_card.c:1243: warning: assignment from incompatible pointer type

Fixing the notify callback prototype solves it.

Signed-off-by: Jean Delvare <kh...@linux-fr.org>
Cc: Hans Verkuil <hverk...@xs4all.nl>
Cc: Trent Piepho <xy...@speakeasy.org>
---
 linux/drivers/media/video/zoran/zoran_card.c |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

--- v4l-dvb.orig/linux/drivers/media/video/zoran/zoran_card.c   2009-03-15 
10:09:47.000000000 +0100
+++ v4l-dvb/linux/drivers/media/video/zoran/zoran_card.c        2009-03-15 
10:17:26.000000000 +0100
@@ -1197,7 +1197,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);
 
@@ -1207,7 +1207,6 @@ static int zoran_subdev_notify(struct v4
                GPIO(zr, 7, 0);
        else if (cmd == BT819_FIFO_RESET_HIGH)
                GPIO(zr, 7, 1);
-       return 0;
 }
 
 /*


-- 
Jean Delvare
--
To unsubscribe from this list: send the line "unsubscribe linux-media" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to