diff options
| author | Jean-Francois Moine <moinejf@free.fr> | 2009-01-07 08:00:54 +0100 |
|---|---|---|
| committer | Jean-Francois Moine <moinejf@free.fr> | 2009-01-07 08:00:54 +0100 |
| commit | e58335e9d298bd6426af83e7995f75231aaa531b (patch) | |
| tree | 9e49ade2ae979b0e266887d3a58efc966d391ad9 /linux/drivers/media/video/gspca/sonixj.c | |
| parent | 42e18907f40429416ed11adb3b264a0a39467599 (diff) | |
| parent | 49ca9ac4b90c1edaa71c4c739b6934c1dee0a594 (diff) | |
| download | mediapointer-dvb-s2-e58335e9d298bd6426af83e7995f75231aaa531b.tar.gz mediapointer-dvb-s2-e58335e9d298bd6426af83e7995f75231aaa531b.tar.bz2 | |
merge: v4l-dvb
Diffstat (limited to 'linux/drivers/media/video/gspca/sonixj.c')
| -rw-r--r-- | linux/drivers/media/video/gspca/sonixj.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/linux/drivers/media/video/gspca/sonixj.c b/linux/drivers/media/video/gspca/sonixj.c index 217db0d88..f977dd22e 100644 --- a/linux/drivers/media/video/gspca/sonixj.c +++ b/linux/drivers/media/video/gspca/sonixj.c @@ -1026,7 +1026,6 @@ static int sd_config(struct gspca_dev *gspca_dev, struct cam *cam; cam = &gspca_dev->cam; - cam->epaddr = 0x01; cam->cam_mode = vga_mode; cam->nmodes = ARRAY_SIZE(vga_mode); @@ -1810,8 +1809,10 @@ static struct usb_driver sd_driver = { /* -- module insert / remove -- */ static int __init sd_mod_init(void) { - if (usb_register(&sd_driver) < 0) - return -1; + int ret; + ret = usb_register(&sd_driver); + if (ret < 0) + return ret; info("registered"); return 0; } |