diff options
| author | Jean-Francois Moine <moinejf@free.fr> | 2009-01-20 14:03:31 +0100 |
|---|---|---|
| committer | Jean-Francois Moine <moinejf@free.fr> | 2009-01-20 14:03:31 +0100 |
| commit | 7eeca606e6f069419f33e54b3eda52bfe545bc43 (patch) | |
| tree | e2202d2a5f34b5b12ea99c552eb76d943a2de279 /linux/drivers/media/video/gspca/sonixb.c | |
| parent | 8b8d5d53029339f50706bc1a3b099cedae2abf6a (diff) | |
| parent | 5b8037b48a2ec01ef6b8cb460a96db73d5d276ba (diff) | |
| download | mediapointer-dvb-s2-7eeca606e6f069419f33e54b3eda52bfe545bc43.tar.gz mediapointer-dvb-s2-7eeca606e6f069419f33e54b3eda52bfe545bc43.tar.bz2 | |
merge:v4l-dvb
Diffstat (limited to 'linux/drivers/media/video/gspca/sonixb.c')
| -rw-r--r-- | linux/drivers/media/video/gspca/sonixb.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/linux/drivers/media/video/gspca/sonixb.c b/linux/drivers/media/video/gspca/sonixb.c index 75b44b362..edb2bfa85 100644 --- a/linux/drivers/media/video/gspca/sonixb.c +++ b/linux/drivers/media/video/gspca/sonixb.c @@ -900,7 +900,6 @@ static int sd_config(struct gspca_dev *gspca_dev, gspca_dev->ctrl_dis = sensor_data[sd->sensor].ctrl_dis; cam = &gspca_dev->cam; - cam->epaddr = 0x01; if (!(sensor_data[sd->sensor].flags & F_SIF)) { cam->cam_mode = vga_mode; cam->nmodes = ARRAY_SIZE(vga_mode); @@ -1302,8 +1301,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; PDEBUG(D_PROBE, "registered"); return 0; } |