diff options
| author | Jean-Francois Moine <moinejf@free.fr> | 2009-01-24 12:02:47 +0100 |
|---|---|---|
| committer | Jean-Francois Moine <moinejf@free.fr> | 2009-01-24 12:02:47 +0100 |
| commit | e30891c22cbad9f8099004481b43588f84905801 (patch) | |
| tree | 857def94eb83cdf5ddc8db414307fe1c313326d9 /linux/drivers/media/video/gspca/vc032x.c | |
| parent | 7675a6ebbda69456487f54377309a922b4f415e9 (diff) | |
| parent | 5c23c4c25b7a5368c45f7ee2c0c5dedaf6af346a (diff) | |
| download | mediapointer-dvb-s2-e30891c22cbad9f8099004481b43588f84905801.tar.gz mediapointer-dvb-s2-e30891c22cbad9f8099004481b43588f84905801.tar.bz2 | |
merge: v4l-dvb
Diffstat (limited to 'linux/drivers/media/video/gspca/vc032x.c')
| -rw-r--r-- | linux/drivers/media/video/gspca/vc032x.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/linux/drivers/media/video/gspca/vc032x.c b/linux/drivers/media/video/gspca/vc032x.c index 82dc818f4..a615cc402 100644 --- a/linux/drivers/media/video/gspca/vc032x.c +++ b/linux/drivers/media/video/gspca/vc032x.c @@ -2005,7 +2005,6 @@ static int sd_config(struct gspca_dev *gspca_dev, int sensor; cam = &gspca_dev->cam; - cam->epaddr = 0x02; sd->bridge = id->driver_info; vc0321_reset(gspca_dev); @@ -2486,8 +2485,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; } |