This is a small patch against Greg's tree.

Changes:
- Correct calculation of R,G,B origin
- Gain fixes for PAS106B and PAS202BCB image sensors

Signed-off-by: Luca Risolia <[EMAIL PROTECTED]>

Greg, if possible, I would like to see this patch applied before
2.6.8 is out.

Thanks,
        Luca


diff -uprN -X dontdiff linux-2.6.7/drivers/usb/media/sn9c102_core.c 
devel-2.6.7/drivers/usb/media/sn9c102_core.c
--- linux-2.6.7/drivers/usb/media/sn9c102_core.c        2004-08-03 09:59:02.000000000 
+0200
+++ devel-2.6.7/drivers/usb/media/sn9c102_core.c        2004-08-08 07:50:14.000000000 
+0200
@@ -1706,8 +1706,10 @@ static int sn9c102_v4l2_ioctl(struct ino
                        }
 
                /* 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 -uprN -X dontdiff linux-2.6.7/drivers/usb/media/sn9c102.h 
devel-2.6.7/drivers/usb/media/sn9c102.h
--- linux-2.6.7/drivers/usb/media/sn9c102.h     2004-08-03 09:59:10.000000000 +0200
+++ devel-2.6.7/drivers/usb/media/sn9c102.h     2004-08-08 07:50:22.000000000 +0200
@@ -52,8 +52,8 @@
 #define SN9C102_MODULE_AUTHOR   "(C) 2004 Luca Risolia"
 #define SN9C102_AUTHOR_EMAIL    "<[EMAIL PROTECTED]>"
 #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 -uprN -X dontdiff linux-2.6.7/drivers/usb/media/sn9c102_pas106b.c 
devel-2.6.7/drivers/usb/media/sn9c102_pas106b.c
--- linux-2.6.7/drivers/usb/media/sn9c102_pas106b.c     2004-08-03 09:59:21.000000000 
+0200
+++ devel-2.6.7/drivers/usb/media/sn9c102_pas106b.c     2004-08-08 07:50:30.000000000 
+0200
@@ -174,7 +174,7 @@ static struct sn9c102_sensor pas106b = {
                        .minimum = 0x00,
                        .maximum = 0x1f,
                        .step = 0x01,
-                       .default_value = 0x06,
+                       .default_value = 0x0d,
                        .flags = 0,
                },
                {
diff -uprN -X dontdiff linux-2.6.7/drivers/usb/media/sn9c102_pas202bcb.c 
devel-2.6.7/drivers/usb/media/sn9c102_pas202bcb.c
--- linux-2.6.7/drivers/usb/media/sn9c102_pas202bcb.c   2004-08-03 09:59:27.000000000 
+0200
+++ devel-2.6.7/drivers/usb/media/sn9c102_pas202bcb.c   2004-08-08 07:50:38.000000000 
+0200
@@ -167,7 +167,7 @@ static struct sn9c102_sensor pas202bcb =
                        .minimum = 0x00,
                        .maximum = 0x1f,
                        .step = 0x01,
-                       .default_value = 0x06,
+                       .default_value = 0x0c,
                        .flags = 0,
                },
                {

Attachment: pgp2Iqc7De1s5.pgp
Description: PGP signature

Reply via email to