diff options
| author | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-01-27 23:47:50 -0200 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-01-27 23:47:50 -0200 |
| commit | 471270c843cfbff8d1b8944c0c54850c121dd6e2 (patch) | |
| tree | 36e10dd9738cf3921f233f8d1f30cd4aedefea60 /linux/drivers/media/video/gspca/sonixb.c | |
| parent | 21877231e3db3aea6295d62290c7a5f9fe7e6d84 (diff) | |
| parent | 4c1cb43c04ca0444e3dcb8113386c5fe84324496 (diff) | |
| download | mediapointer-dvb-s2-471270c843cfbff8d1b8944c0c54850c121dd6e2.tar.gz mediapointer-dvb-s2-471270c843cfbff8d1b8944c0c54850c121dd6e2.tar.bz2 | |
merge: http://linuxtv.org/hg/~jfrancois/gspca/
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/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; } |