]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
media: gspca_pac7302: make red balance and blue balance controls work again
authorFrank Schäfer <fschaefer.oss@googlemail.com>
Sun, 9 Sep 2012 18:02:20 +0000 (15:02 -0300)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 12 Oct 2012 20:50:18 +0000 (05:50 +0900)
commit db43b9ca2f101d0945d043fa7d5ecd8f2da17fef upstream.

Fix a regression from kernel 3.4 which has been introduced with the conversion of the gspca driver to the v4l2 control framework.

Signed-off-by: Frank Schäfer <fschaefer.oss@googlemail.com>
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/media/video/gspca/pac7302.c

index e906f564ca8554fc7998dc1e4379e6dcd8cd1960..eb3c90e4a6582fb0bc057083f1195ff346033406 100644 (file)
@@ -616,7 +616,7 @@ static int sd_init_controls(struct gspca_dev *gspca_dev)
        sd->red_balance = v4l2_ctrl_new_std(hdl, &sd_ctrl_ops,
                                        V4L2_CID_RED_BALANCE, 0, 3, 1, 1);
        sd->blue_balance = v4l2_ctrl_new_std(hdl, &sd_ctrl_ops,
-                                       V4L2_CID_RED_BALANCE, 0, 3, 1, 1);
+                                       V4L2_CID_BLUE_BALANCE, 0, 3, 1, 1);
 
        gspca_dev->autogain = v4l2_ctrl_new_std(hdl, &sd_ctrl_ops,
                                        V4L2_CID_AUTOGAIN, 0, 1, 1, 1);