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/stk014.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/stk014.c')
| -rw-r--r-- | linux/drivers/media/video/gspca/stk014.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/linux/drivers/media/video/gspca/stk014.c b/linux/drivers/media/video/gspca/stk014.c index 60de9af87..ba31eb318 100644 --- a/linux/drivers/media/video/gspca/stk014.c +++ b/linux/drivers/media/video/gspca/stk014.c @@ -180,7 +180,7 @@ static int rcv_val(struct gspca_dev *gspca_dev, reg_w(gspca_dev, 0x63b, 0); reg_w(gspca_dev, 0x630, 5); ret = usb_bulk_msg(dev, - usb_rcvbulkpipe(dev, 5), + usb_rcvbulkpipe(dev, 0x05), gspca_dev->usb_buf, 4, /* length */ &alen, @@ -294,9 +294,7 @@ static int sd_config(struct gspca_dev *gspca_dev, const struct usb_device_id *id) { struct sd *sd = (struct sd *) gspca_dev; - struct cam *cam = &gspca_dev->cam; - cam->epaddr = 0x02; gspca_dev->cam.cam_mode = vga_mode; gspca_dev->cam.nmodes = ARRAY_SIZE(vga_mode); sd->brightness = BRIGHTNESS_DEF; @@ -562,8 +560,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; info("registered"); return 0; } |