diff options
author | Mauro Carvalho Chehab <mchehab@redhat.com> | 2008-10-04 14:42:43 -0300 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2008-10-04 14:42:43 -0300 |
commit | edd1d19fe9c951f51b87b6a614f3e5abc2a6c12e (patch) | |
tree | 90ac437585d333e24fb14cd6a225794e7c8d236f /linux/drivers/media/video/gspca/spca506.c | |
parent | 04e7c9cdf0dcd3290fb18cf3d4c546553a19a053 (diff) | |
parent | 497b9fe8337262924cddfabd1dbb48c7ee041bd2 (diff) | |
download | mediapointer-dvb-s2-edd1d19fe9c951f51b87b6a614f3e5abc2a6c12e.tar.gz mediapointer-dvb-s2-edd1d19fe9c951f51b87b6a614f3e5abc2a6c12e.tar.bz2 |
merge: http://hg.jannau.net/v4l-dvb
From: Mauro Carvalho Chehab <mchehab@redhat.com>
Priority: normal
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'linux/drivers/media/video/gspca/spca506.c')
-rw-r--r-- | linux/drivers/media/video/gspca/spca506.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/linux/drivers/media/video/gspca/spca506.c b/linux/drivers/media/video/gspca/spca506.c index 195dce96e..645ee9d44 100644 --- a/linux/drivers/media/video/gspca/spca506.c +++ b/linux/drivers/media/video/gspca/spca506.c @@ -422,7 +422,7 @@ static int sd_init(struct gspca_dev *gspca_dev) return 0; } -static void sd_start(struct gspca_dev *gspca_dev) +static int sd_start(struct gspca_dev *gspca_dev) { struct usb_device *dev = gspca_dev->dev; __u16 norme; @@ -549,6 +549,7 @@ static void sd_start(struct gspca_dev *gspca_dev) PDEBUG(D_STREAM, "webcam started"); spca506_GetNormeInput(gspca_dev, &norme, &channel); spca506_SetNormeInput(gspca_dev, norme, channel); + return 0; } static void sd_stopN(struct gspca_dev *gspca_dev) |