diff options
| author | Jean-Francois Moine <moinejf@free.fr> | 2009-01-10 09:11:32 +0100 |
|---|---|---|
| committer | Jean-Francois Moine <moinejf@free.fr> | 2009-01-10 09:11:32 +0100 |
| commit | 032e70cf33b0001549dc19102868a8e9ea1c0e8d (patch) | |
| tree | 409b8f8280a9cc94f017e52182e3920fdc6df056 /linux/drivers/media/video/gspca/spca506.c | |
| parent | 400f61f9a15652c5702f073ee0bab50103ef0500 (diff) | |
| parent | 6c69d1429f52dba16d0ed37ad632bdea237b5526 (diff) | |
| download | mediapointer-dvb-s2-032e70cf33b0001549dc19102868a8e9ea1c0e8d.tar.gz mediapointer-dvb-s2-032e70cf33b0001549dc19102868a8e9ea1c0e8d.tar.bz2 | |
merge: v4l-dvb
Diffstat (limited to 'linux/drivers/media/video/gspca/spca506.c')
| -rw-r--r-- | linux/drivers/media/video/gspca/spca506.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/linux/drivers/media/video/gspca/spca506.c b/linux/drivers/media/video/gspca/spca506.c index 96e2512e0..8cedb0097 100644 --- a/linux/drivers/media/video/gspca/spca506.c +++ b/linux/drivers/media/video/gspca/spca506.c @@ -303,7 +303,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 = sizeof vga_mode / sizeof vga_mode[0]; sd->brightness = sd_ctrls[SD_BRIGHTNESS].qctrl.default_value; @@ -772,8 +771,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; } |