diff options
| author | Jean-Francois Moine <moinejf@free.fr> | 2009-01-01 20:31:12 +0100 |
|---|---|---|
| committer | Jean-Francois Moine <moinejf@free.fr> | 2009-01-01 20:31:12 +0100 |
| commit | 49ca9ac4b90c1edaa71c4c739b6934c1dee0a594 (patch) | |
| tree | 998d5ac2a789385656d017225cb134fd435bbf5c /linux/drivers/media/video/gspca/etoms.c | |
| parent | 70e0ec035b78cab8338a5b20518bfc1d1307b7ad (diff) | |
| parent | 3bdb904852c74d8c0d7c55a17fb9ed559ae1e855 (diff) | |
| download | mediapointer-dvb-s2-49ca9ac4b90c1edaa71c4c739b6934c1dee0a594.tar.gz mediapointer-dvb-s2-49ca9ac4b90c1edaa71c4c739b6934c1dee0a594.tar.bz2 | |
merge: v4l-dvb
Diffstat (limited to 'linux/drivers/media/video/gspca/etoms.c')
| -rw-r--r-- | linux/drivers/media/video/gspca/etoms.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/linux/drivers/media/video/gspca/etoms.c b/linux/drivers/media/video/gspca/etoms.c index 84b56c303..7e69d7bed 100644 --- a/linux/drivers/media/video/gspca/etoms.c +++ b/linux/drivers/media/video/gspca/etoms.c @@ -658,7 +658,6 @@ static int sd_config(struct gspca_dev *gspca_dev, struct cam *cam; cam = &gspca_dev->cam; - cam->epaddr = 1; sd->sensor = id->driver_info; if (sd->sensor == SENSOR_PAS106) { cam->cam_mode = sif_mode; @@ -934,8 +933,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; } |