| Message ID | 20180524150931.26574-2-linux@rainbow-software.org (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On 24/05/18 17:09, Ondrej Zary wrote: > Power line frequency settings for OV7648 sensor contain autogain > and exposure commands, affecting unrelated controls. Remove them. > > Signed-off-by: Ondrej Zary <linux@rainbow-software.org> > --- > drivers/media/usb/gspca/zc3xx.c | 17 ++++++++++------- > 1 file changed, 10 insertions(+), 7 deletions(-) > > diff --git a/drivers/media/usb/gspca/zc3xx.c b/drivers/media/usb/gspca/zc3xx.c > index 992918b3ad0c..9a78420e8ad8 100644 > --- a/drivers/media/usb/gspca/zc3xx.c > +++ b/drivers/media/usb/gspca/zc3xx.c > @@ -3184,7 +3184,8 @@ static const struct usb_action ov7620_InitialScale[] = { /* 320x240 */ > {} > }; > static const struct usb_action ov7620_50HZ[] = { > - {0xaa, 0x13, 0x00a3}, /* 00,13,a3,aa */ > +/* {0xaa, 0x13, 0x00a3}, * 00,13,a3,aa > + * don't change autoexposure */ > {0xdd, 0x00, 0x0100}, /* 00,01,00,dd */ > {0xaa, 0x2b, 0x0096}, /* 00,2b,96,aa */ > {0xaa, 0x75, 0x008a}, /* 00,75,8a,aa */ Just remove these lines altogether. There are still present in the git history if they are ever needed again. Same for the next patch. Regards, Hans > @@ -3195,15 +3196,16 @@ static const struct usb_action ov7620_50HZ[] = { > {0xa0, 0x00, ZC3XX_R195_ANTIFLICKERHIGH}, /* 01,95,00,cc */ > {0xa0, 0x00, ZC3XX_R196_ANTIFLICKERMID}, /* 01,96,00,cc */ > {0xa0, 0x83, ZC3XX_R197_ANTIFLICKERLOW}, /* 01,97,83,cc */ > - {0xaa, 0x10, 0x0082}, /* 00,10,82,aa */ > +/* {0xaa, 0x10, 0x0082}, * 00,10,82,aa > + * don't change exposure */ > {0xaa, 0x76, 0x0003}, /* 00,76,03,aa */ > /* {0xa0, 0x40, ZC3XX_R002_CLOCKSELECT}, * 00,02,40,cc > * if mode0 (640x480) */ > {} > }; > static const struct usb_action ov7620_60HZ[] = { > - {0xaa, 0x13, 0x00a3}, /* 00,13,a3,aa */ > - /* (bug in zs211.inf) */ > +/* {0xaa, 0x13, 0x00a3}, * 00,13,a3,aa > + * don't change autoexposure */ > {0xdd, 0x00, 0x0100}, /* 00,01,00,dd */ > {0xaa, 0x2b, 0x0000}, /* 00,2b,00,aa */ > {0xaa, 0x75, 0x008a}, /* 00,75,8a,aa */ > @@ -3214,7 +3216,8 @@ static const struct usb_action ov7620_60HZ[] = { > {0xa0, 0x00, ZC3XX_R195_ANTIFLICKERHIGH}, /* 01,95,00,cc */ > {0xa0, 0x00, ZC3XX_R196_ANTIFLICKERMID}, /* 01,96,00,cc */ > {0xa0, 0x83, ZC3XX_R197_ANTIFLICKERLOW}, /* 01,97,83,cc */ > - {0xaa, 0x10, 0x0020}, /* 00,10,20,aa */ > +/* {0xaa, 0x10, 0x0020}, * 00,10,20,aa > + * don't change exposure */ > {0xaa, 0x76, 0x0003}, /* 00,76,03,aa */ > /* {0xa0, 0x40, ZC3XX_R002_CLOCKSELECT}, * 00,02,40,cc > * if mode0 (640x480) */ > @@ -3224,8 +3227,8 @@ static const struct usb_action ov7620_60HZ[] = { > {} > }; > static const struct usb_action ov7620_NoFliker[] = { > - {0xaa, 0x13, 0x00a3}, /* 00,13,a3,aa */ > - /* (bug in zs211.inf) */ > +/* {0xaa, 0x13, 0x00a3}, * 00,13,a3,aa > + * don't change autoexposure */ > {0xdd, 0x00, 0x0100}, /* 00,01,00,dd */ > {0xaa, 0x2b, 0x0000}, /* 00,2b,00,aa */ > {0xaa, 0x75, 0x008e}, /* 00,75,8e,aa */ >
diff --git a/drivers/media/usb/gspca/zc3xx.c b/drivers/media/usb/gspca/zc3xx.c index 992918b3ad0c..9a78420e8ad8 100644 --- a/drivers/media/usb/gspca/zc3xx.c +++ b/drivers/media/usb/gspca/zc3xx.c @@ -3184,7 +3184,8 @@ static const struct usb_action ov7620_InitialScale[] = { /* 320x240 */ {} }; static const struct usb_action ov7620_50HZ[] = { - {0xaa, 0x13, 0x00a3}, /* 00,13,a3,aa */ +/* {0xaa, 0x13, 0x00a3}, * 00,13,a3,aa + * don't change autoexposure */ {0xdd, 0x00, 0x0100}, /* 00,01,00,dd */ {0xaa, 0x2b, 0x0096}, /* 00,2b,96,aa */ {0xaa, 0x75, 0x008a}, /* 00,75,8a,aa */ @@ -3195,15 +3196,16 @@ static const struct usb_action ov7620_50HZ[] = { {0xa0, 0x00, ZC3XX_R195_ANTIFLICKERHIGH}, /* 01,95,00,cc */ {0xa0, 0x00, ZC3XX_R196_ANTIFLICKERMID}, /* 01,96,00,cc */ {0xa0, 0x83, ZC3XX_R197_ANTIFLICKERLOW}, /* 01,97,83,cc */ - {0xaa, 0x10, 0x0082}, /* 00,10,82,aa */ +/* {0xaa, 0x10, 0x0082}, * 00,10,82,aa + * don't change exposure */ {0xaa, 0x76, 0x0003}, /* 00,76,03,aa */ /* {0xa0, 0x40, ZC3XX_R002_CLOCKSELECT}, * 00,02,40,cc * if mode0 (640x480) */ {} }; static const struct usb_action ov7620_60HZ[] = { - {0xaa, 0x13, 0x00a3}, /* 00,13,a3,aa */ - /* (bug in zs211.inf) */ +/* {0xaa, 0x13, 0x00a3}, * 00,13,a3,aa + * don't change autoexposure */ {0xdd, 0x00, 0x0100}, /* 00,01,00,dd */ {0xaa, 0x2b, 0x0000}, /* 00,2b,00,aa */ {0xaa, 0x75, 0x008a}, /* 00,75,8a,aa */ @@ -3214,7 +3216,8 @@ static const struct usb_action ov7620_60HZ[] = { {0xa0, 0x00, ZC3XX_R195_ANTIFLICKERHIGH}, /* 01,95,00,cc */ {0xa0, 0x00, ZC3XX_R196_ANTIFLICKERMID}, /* 01,96,00,cc */ {0xa0, 0x83, ZC3XX_R197_ANTIFLICKERLOW}, /* 01,97,83,cc */ - {0xaa, 0x10, 0x0020}, /* 00,10,20,aa */ +/* {0xaa, 0x10, 0x0020}, * 00,10,20,aa + * don't change exposure */ {0xaa, 0x76, 0x0003}, /* 00,76,03,aa */ /* {0xa0, 0x40, ZC3XX_R002_CLOCKSELECT}, * 00,02,40,cc * if mode0 (640x480) */ @@ -3224,8 +3227,8 @@ static const struct usb_action ov7620_60HZ[] = { {} }; static const struct usb_action ov7620_NoFliker[] = { - {0xaa, 0x13, 0x00a3}, /* 00,13,a3,aa */ - /* (bug in zs211.inf) */ +/* {0xaa, 0x13, 0x00a3}, * 00,13,a3,aa + * don't change autoexposure */ {0xdd, 0x00, 0x0100}, /* 00,01,00,dd */ {0xaa, 0x2b, 0x0000}, /* 00,2b,00,aa */ {0xaa, 0x75, 0x008e}, /* 00,75,8e,aa */
Power line frequency settings for OV7648 sensor contain autogain and exposure commands, affecting unrelated controls. Remove them. Signed-off-by: Ondrej Zary <linux@rainbow-software.org> --- drivers/media/usb/gspca/zc3xx.c | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-)