2 files changed, 79 insertions, 77 deletions

diff --git a/drivers/media/video/gspca/Kconfig b/drivers/media/video/gspca/Kconfig
index 4d0817471c9f..6b557c057fac 100644
--- a/drivers/media/video/gspca/Kconfig
+++ b/drivers/media/video/gspca/Kconfig
@@ -3,16 +3,16 @@ menuconfig USB_GSPCA
         depends on VIDEO_V4L2
         default m
         ---help---
-        Say Y here if you want to enable selecting webcams based
-        on the GSPCA framework.
+          Say Y here if you want to enable selecting webcams based
+          on the GSPCA framework.
 
-        See <file:Documentation/video4linux/gspca.txt> for more info.
+          See <file:Documentation/video4linux/gspca.txt> for more info.
 
-        This driver uses the Video For Linux API. You must say Y or M to
-        "Video For Linux" to use this driver.
+          This driver uses the Video For Linux API. You must say Y or M to
+          "Video For Linux" to use this driver.
 
-        To compile this driver as modules, choose M here: the
-        modules will be called gspca_main.
+          To compile this driver as modules, choose M here: the
+          modules will be called gspca_main.
 
 
 if USB_GSPCA && VIDEO_V4L2
@@ -23,190 +23,190 @@ config USB_GSPCA_CONEX
         tristate "Conexant Camera Driver"
         depends on VIDEO_V4L2 && USB_GSPCA
         help
-        Say Y here if you want support for cameras based on the Conexant chip.
+          Say Y here if you want support for cameras based on the Conexant chip.
 
-        To compile this driver as a module, choose M here: the
-        module will be called gspca_conex.
+          To compile this driver as a module, choose M here: the
+          module will be called gspca_conex.
 
 config USB_GSPCA_ETOMS
         tristate "Etoms USB Camera Driver"
         depends on VIDEO_V4L2 && USB_GSPCA
         help
-        Say Y here if you want support for cameras based on the Etoms chip.
+          Say Y here if you want support for cameras based on the Etoms chip.
 
-        To compile this driver as a module, choose M here: the
-        module will be called gspca_etoms.
+          To compile this driver as a module, choose M here: the
+          module will be called gspca_etoms.
 
 config USB_GSPCA_FINEPIX
         tristate "Fujifilm FinePix USB V4L2 driver"
         depends on VIDEO_V4L2 && USB_GSPCA
         help
-        Say Y here if you want support for cameras based on the FinePix chip.
+          Say Y here if you want support for cameras based on the FinePix chip.
 
-        To compile this driver as a module, choose M here: the
-        module will be called gspca_finepix.
+          To compile this driver as a module, choose M here: the
+          module will be called gspca_finepix.
 
 config USB_GSPCA_MARS
         tristate "Mars USB Camera Driver"
         depends on VIDEO_V4L2 && USB_GSPCA
         help
-        Say Y here if you want support for cameras based on the Mars chip.
+          Say Y here if you want support for cameras based on the Mars chip.
 
-        To compile this driver as a module, choose M here: the
-        module will be called gspca_mars.
+          To compile this driver as a module, choose M here: the
+          module will be called gspca_mars.
 
 config USB_GSPCA_OV519
         tristate "OV519 USB Camera Driver"
         depends on VIDEO_V4L2 && USB_GSPCA
         help
-        Say Y here if you want support for cameras based on the OV519 chip.
+          Say Y here if you want support for cameras based on the OV519 chip.
 
-        To compile this driver as a module, choose M here: the
-        module will be called gspca_ov519.
+          To compile this driver as a module, choose M here: the
+          module will be called gspca_ov519.
 
 config USB_GSPCA_PAC207
         tristate "Pixart PAC207 USB Camera Driver"
         depends on VIDEO_V4L2 && USB_GSPCA
         help
-        Say Y here if you want support for cameras based on the PAC207 chip.
+          Say Y here if you want support for cameras based on the PAC207 chip.
 
-        To compile this driver as a module, choose M here: the
-        module will be called gspca_pac207.
+          To compile this driver as a module, choose M here: the
+          module will be called gspca_pac207.
 
 config USB_GSPCA_PAC7311
         tristate "Pixart PAC7311 USB Camera Driver"
         depends on VIDEO_V4L2 && USB_GSPCA
         help
-        Say Y here if you want support for cameras based on the PAC7311 chip.
+          Say Y here if you want support for cameras based on the PAC7311 chip.
 
-        To compile this driver as a module, choose M here: the
-        module will be called gspca_pac7311.
+          To compile this driver as a module, choose M here: the
+          module will be called gspca_pac7311.
 
 config USB_GSPCA_SONIXB
         tristate "SN9C102 USB Camera Driver"
         depends on VIDEO_V4L2 && USB_GSPCA
         help
-        Say Y here if you want support for cameras based on the SONIXB chip.
+          Say Y here if you want support for cameras based on the SONIXB chip.
 
-        To compile this driver as a module, choose M here: the
-        module will be called gspca_sonixb.
+          To compile this driver as a module, choose M here: the
+          module will be called gspca_sonixb.
 
 config USB_GSPCA_SONIXJ
         tristate "SONIX JPEG USB Camera Driver"
         depends on VIDEO_V4L2 && USB_GSPCA
         help
-        Say Y here if you want support for cameras based on the SONIXJ chip.
+          Say Y here if you want support for cameras based on the SONIXJ chip.
 
-        To compile this driver as a module, choose M here: the
-        module will be called gspca_sonixj
+          To compile this driver as a module, choose M here: the
+          module will be called gspca_sonixj
 
 config USB_GSPCA_SPCA500
         tristate "SPCA500 USB Camera Driver"
         depends on VIDEO_V4L2 && USB_GSPCA
         help
-        Say Y here if you want support for cameras based on the SPCA500 chip.
+          Say Y here if you want support for cameras based on the SPCA500 chip.
 
-        To compile this driver as a module, choose M here: the
-        module will be called gspca_spca500.
+          To compile this driver as a module, choose M here: the
+          module will be called gspca_spca500.
 
 config USB_GSPCA_SPCA501
         tristate "SPCA501 USB Camera Driver"
         depends on VIDEO_V4L2 && USB_GSPCA
         help
-        Say Y here if you want support for cameras based on the SPCA501 chip.
+          Say Y here if you want support for cameras based on the SPCA501 chip.
 
-        To compile this driver as a module, choose M here: the
-        module will be called gspca_spca501.
+          To compile this driver as a module, choose M here: the
+          module will be called gspca_spca501.
 
 config USB_GSPCA_SPCA505
         tristate "SPCA505 USB Camera Driver"
         depends on VIDEO_V4L2 && USB_GSPCA
         help
-        Say Y here if you want support for cameras based on the SPCA505 chip.
+          Say Y here if you want support for cameras based on the SPCA505 chip.
 
-        To compile this driver as a module, choose M here: the
-        module will be called gspca_spca505.
+          To compile this driver as a module, choose M here: the
+          module will be called gspca_spca505.
 
 config USB_GSPCA_SPCA506
         tristate "SPCA506 USB Camera Driver"
         depends on VIDEO_V4L2 && USB_GSPCA
         help
-        Say Y here if you want support for cameras based on the SPCA506 chip.
+          Say Y here if you want support for cameras based on the SPCA506 chip.
 
-        To compile this driver as a module, choose M here: the
-        module will be called gspca_spca506.
+          To compile this driver as a module, choose M here: the
+          module will be called gspca_spca506.
 
 config USB_GSPCA_SPCA508
         tristate "SPCA508 USB Camera Driver"
         depends on VIDEO_V4L2 && USB_GSPCA
         help
-        Say Y here if you want support for cameras based on the SPCA508 chip.
+          Say Y here if you want support for cameras based on the SPCA508 chip.
 
-        To compile this driver as a module, choose M here: the
-        module will be called gspca_spca508.
+          To compile this driver as a module, choose M here: the
+          module will be called gspca_spca508.
 
 config USB_GSPCA_SPCA561
         tristate "SPCA561 USB Camera Driver"
         depends on VIDEO_V4L2 && USB_GSPCA
         help
-        Say Y here if you want support for cameras based on the SPCA561 chip.
+          Say Y here if you want support for cameras based on the SPCA561 chip.
 
-        To compile this driver as a module, choose M here: the
-        module will be called gspca_spca561.
+          To compile this driver as a module, choose M here: the
+          module will be called gspca_spca561.
 
 config USB_GSPCA_STK014
         tristate "Syntek DV4000 (STK014) USB Camera Driver"
         depends on VIDEO_V4L2 && USB_GSPCA
         help
-        Say Y here if you want support for cameras based on the STK014 chip.
+          Say Y here if you want support for cameras based on the STK014 chip.
 
-        To compile this driver as a module, choose M here: the
-        module will be called gspca_stk014.
+          To compile this driver as a module, choose M here: the
+          module will be called gspca_stk014.
 
 config USB_GSPCA_SUNPLUS
         tristate "SUNPLUS USB Camera Driver"
         depends on VIDEO_V4L2 && USB_GSPCA
         help
-        Say Y here if you want support for cameras based on the Sunplus
-        SPCA504(abc) SPCA533 SPCA536 chips.
+          Say Y here if you want support for cameras based on the Sunplus
+          SPCA504(abc) SPCA533 SPCA536 chips.
 
-        To compile this driver as a module, choose M here: the
-        module will be called gspca_spca5xx.
+          To compile this driver as a module, choose M here: the
+          module will be called gspca_spca5xx.
 
 config USB_GSPCA_T613
         tristate "T613 (JPEG Compliance) USB Camera Driver"
         depends on VIDEO_V4L2 && USB_GSPCA
         help
-        Say Y here if you want support for cameras based on the T613 chip.
+          Say Y here if you want support for cameras based on the T613 chip.
 
-        To compile this driver as a module, choose M here: the
-        module will be called gspca_t613.
+          To compile this driver as a module, choose M here: the
+          module will be called gspca_t613.
 
 config USB_GSPCA_TV8532
         tristate "TV8532 USB Camera Driver"
         depends on VIDEO_V4L2 && USB_GSPCA
         help
-        Say Y here if you want support for cameras based on the TV8531 chip.
+          Say Y here if you want support for cameras based on the TV8531 chip.
 
-        To compile this driver as a module, choose M here: the
-        module will be called gspca_tv8532.
+          To compile this driver as a module, choose M here: the
+          module will be called gspca_tv8532.
 
 config USB_GSPCA_VC032X
         tristate "VC032X USB Camera Driver"
         depends on VIDEO_V4L2 && USB_GSPCA
         help
-        Say Y here if you want support for cameras based on the VC032X chip.
+          Say Y here if you want support for cameras based on the VC032X chip.
 
-        To compile this driver as a module, choose M here: the
-        module will be called gspca_vc032x.
+          To compile this driver as a module, choose M here: the
+          module will be called gspca_vc032x.
 
 config USB_GSPCA_ZC3XX
-        tristate "VC3xx USB Camera Driver"
+        tristate "ZC3XX USB Camera Driver"
         depends on VIDEO_V4L2 && USB_GSPCA
         help
-        Say Y here if you want support for cameras based on the ZC3XX chip.
+          Say Y here if you want support for cameras based on the ZC3XX chip.
 
-        To compile this driver as a module, choose M here: the
-        module will be called gspca_zc3xx.
+          To compile this driver as a module, choose M here: the
+          module will be called gspca_zc3xx.
 
 endif
diff --git a/drivers/media/video/gspca/zc3xx.c b/drivers/media/video/gspca/zc3xx.c
index d0a4451dc46f..8b3101d347c3 100644
--- a/drivers/media/video/gspca/zc3xx.c
+++ b/drivers/media/video/gspca/zc3xx.c
@@ -2266,7 +2266,7 @@ static const struct usb_action hdcs2020b_NoFliker[] = {
         {}
 };
 
-static const struct usb_action hv7131bxx_Initial[] = {
+static const struct usb_action hv7131bxx_Initial[] = {          /* 320x240 */
         {0xa0, 0x01, ZC3XX_R000_SYSTEMCONTROL},
         {0xa0, 0x10, ZC3XX_R002_CLOCKSELECT},
         {0xa0, 0x00, ZC3XX_R010_CMOSSENSORSELECT},
@@ -2290,7 +2290,7 @@ static const struct usb_action hv7131bxx_Initial[] = {
         {0xaa, 0x14, 0x0001},
         {0xaa, 0x15, 0x00e8},
         {0xaa, 0x16, 0x0002},
-        {0xaa, 0x17, 0x0086},
+        {0xaa, 0x17, 0x0086},           /* 00,17,88,aa */
         {0xaa, 0x31, 0x0038},
         {0xaa, 0x32, 0x0038},
         {0xaa, 0x33, 0x0038},
@@ -2309,7 +2309,7 @@ static const struct usb_action hv7131bxx_Initial[] = {
         {0xa0, 0x13, ZC3XX_R1CB_SHARPNESS05},
         {0xa0, 0x08, ZC3XX_R250_DEADPIXELSMODE},
         {0xa0, 0x08, ZC3XX_R301_EEPROMACCESS},
-        {0xaa, 0x02, 0x0080},   /* {0xaa, 0x02, 0x0090}; */
+        {0xaa, 0x02, 0x0090},                   /* 00,02,80,aa */
         {0xa1, 0x01, 0x0002},
         {0xa0, 0x00, ZC3XX_R092_I2CADDRESSSELECT},
         {0xa0, 0x02, ZC3XX_R090_I2CCOMMAND},
@@ -2374,7 +2374,7 @@ static const struct usb_action hv7131bxx_Initial[] = {
         {}
 };
 
-static const struct usb_action hv7131bxx_InitialScale[] = {
+static const struct usb_action hv7131bxx_InitialScale[] = {     /* 640x480*/
         {0xa0, 0x01, ZC3XX_R000_SYSTEMCONTROL},
         {0xa0, 0x00, ZC3XX_R002_CLOCKSELECT},
         {0xa0, 0x00, ZC3XX_R010_CMOSSENSORSELECT},
@@ -6388,6 +6388,8 @@ static void setbrightness(struct gspca_dev *gspca_dev)
 /*fixme: is it really write to 011d and 018d for all other sensors? */
         brightness = sd->brightness;
         reg_w(gspca_dev->dev, brightness, 0x011d);
+        if (sd->sensor == SENSOR_HV7131B)
+                return;
         if (brightness < 0x70)
                 brightness += 0x10;
         else
@@ -6529,6 +6531,7 @@ static void setquality(struct gspca_dev *gspca_dev)
 
         switch (sd->sensor) {
         case SENSOR_GC0305:
+        case SENSOR_HV7131B:
         case SENSOR_OV7620:
         case SENSOR_PO2030:
                 return;
@@ -7209,7 +7212,6 @@ static int sd_start(struct gspca_dev *gspca_dev)
         mode = gspca_dev->cam.cam_mode[(int) gspca_dev->curr_mode].priv;
         zc3_init = init_tb[(int) sd->sensor][mode];
         switch (sd->sensor) {
-        case SENSOR_HV7131B:
         case SENSOR_HV7131C:
                 zcxx_probeSensor(gspca_dev);
                 break;