summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLuca Risolia <luca.risolia@studio.unibo.it>2004-08-08 23:53:38 -0700
committerGreg Kroah-Hartman <greg@kroah.com>2004-08-08 23:53:38 -0700
commit0fbc2a62fbf94b53d5e7cd45043e6f0df672c7d4 (patch)
tree3c16a87253cef3b18dcf237675bf5a784c17dcda
parent16ed47332d4d38d23e12230f0d47d21027afb0fe (diff)
[PATCH] USB: SN9C10[12] driver update
Changes: - Correct calculation of R,G,B origin - Gain fixes for PAS106B and PAS202BCB image sensors Signed-off-by: Luca Risolia <luca.risolia@studio.unibo.it> Signed-off-by: Greg Kroah-Hartman <greg@kroah.com>
-rw-r--r--drivers/usb/media/sn9c102.h4
-rw-r--r--drivers/usb/media/sn9c102_core.c6
-rw-r--r--drivers/usb/media/sn9c102_pas106b.c2
-rw-r--r--drivers/usb/media/sn9c102_pas202bcb.c2
4 files changed, 8 insertions, 6 deletions
diff --git a/drivers/usb/media/sn9c102.h b/drivers/usb/media/sn9c102.h
index ba40fb763661..10008b550342 100644
--- a/drivers/usb/media/sn9c102.h
+++ b/drivers/usb/media/sn9c102.h
@@ -52,8 +52,8 @@
#define SN9C102_MODULE_AUTHOR "(C) 2004 Luca Risolia"
#define SN9C102_AUTHOR_EMAIL "<luca.risolia@studio.unibo.it>"
#define SN9C102_MODULE_LICENSE "GPL"
-#define SN9C102_MODULE_VERSION "1:1.06"
-#define SN9C102_MODULE_VERSION_CODE KERNEL_VERSION(1, 0, 6)
+#define SN9C102_MODULE_VERSION "1:1.07"
+#define SN9C102_MODULE_VERSION_CODE KERNEL_VERSION(1, 0, 7)
SN9C102_ID_TABLE;
SN9C102_SENSOR_TABLE;
diff --git a/drivers/usb/media/sn9c102_core.c b/drivers/usb/media/sn9c102_core.c
index b5883be11542..8a510c16a4a3 100644
--- a/drivers/usb/media/sn9c102_core.c
+++ b/drivers/usb/media/sn9c102_core.c
@@ -1706,8 +1706,10 @@ static int sn9c102_v4l2_ioctl(struct inode* inode, struct file* filp,
}
/* Preserve R,G or B origin */
- rect->left &= ~1L;
- rect->top &= ~1L;
+ rect->left = (s->_rect.left & 1L) ?
+ rect->left | 1L : rect->left & ~1L;
+ rect->top = (s->_rect.top & 1L) ?
+ rect->top | 1L : rect->top & ~1L;
if (rect->width < 16)
rect->width = 16;
diff --git a/drivers/usb/media/sn9c102_pas106b.c b/drivers/usb/media/sn9c102_pas106b.c
index 8322450406ff..3f98082b6f44 100644
--- a/drivers/usb/media/sn9c102_pas106b.c
+++ b/drivers/usb/media/sn9c102_pas106b.c
@@ -174,7 +174,7 @@ static struct sn9c102_sensor pas106b = {
.minimum = 0x00,
.maximum = 0x1f,
.step = 0x01,
- .default_value = 0x06,
+ .default_value = 0x0d,
.flags = 0,
},
{
diff --git a/drivers/usb/media/sn9c102_pas202bcb.c b/drivers/usb/media/sn9c102_pas202bcb.c
index 1affed68b5f0..b8a383dbb348 100644
--- a/drivers/usb/media/sn9c102_pas202bcb.c
+++ b/drivers/usb/media/sn9c102_pas202bcb.c
@@ -167,7 +167,7 @@ static struct sn9c102_sensor pas202bcb = {
.minimum = 0x00,
.maximum = 0x1f,
.step = 0x01,
- .default_value = 0x06,
+ .default_value = 0x0c,
.flags = 0,
},
{