diff options
| author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2008-07-02 08:59:38 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2008-07-02 08:59:38 -0300 |
| commit | fb654add7ee6e9310633e27e8f22cd69cc586feb (patch) | |
| tree | 9ff67d5df65f07c46781f328fe9ad2d0963ed68f /linux/drivers/media/video/gspca/sunplus.c | |
| parent | f4d97e8dd5fbdf7f67425d964626da2d78828306 (diff) | |
| parent | 7badca0e8f91f97d0c3f378c003f564ebcec1a0d (diff) | |
| download | mediapointer-dvb-s2-fb654add7ee6e9310633e27e8f22cd69cc586feb.tar.gz mediapointer-dvb-s2-fb654add7ee6e9310633e27e8f22cd69cc586feb.tar.bz2 | |
merge: http://linuxtv.org/hg/~jfrancois/gspca/
From: Mauro Carvalho Chehab <mchehab@infradead.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'linux/drivers/media/video/gspca/sunplus.c')
| -rw-r--r-- | linux/drivers/media/video/gspca/sunplus.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/linux/drivers/media/video/gspca/sunplus.c b/linux/drivers/media/video/gspca/sunplus.c index 565c47570..fff75a914 100644 --- a/linux/drivers/media/video/gspca/sunplus.c +++ b/linux/drivers/media/video/gspca/sunplus.c @@ -24,8 +24,8 @@ #include "gspca.h" #include "jpeg.h" -#define DRIVER_VERSION_NUMBER KERNEL_VERSION(2, 1, 0) -static const char version[] = "2.1.0"; +#define DRIVER_VERSION_NUMBER KERNEL_VERSION(2, 1, 1) +static const char version[] = "2.1.1"; MODULE_AUTHOR("Michel Xhaard <mxhaard@users.sourceforge.net>"); MODULE_DESCRIPTION("GSPCA/SPCA5xx USB Camera Driver"); @@ -490,7 +490,7 @@ static int reg_write(struct usb_device *dev, USB_TYPE_VENDOR | USB_RECIP_DEVICE, value, index, NULL, 0, 500); PDEBUG(D_PACK, "reg write: 0x%02x,0x%02x:0x%02x, 0x%x", - reg, index, value, ret); + req, index, value, ret); if (ret < 0) PDEBUG(D_ERR, "reg write: error %d", ret); return ret; |