aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/video/pwc
diff options
context:
space:
mode:
authorHans Verkuil <hans.verkuil@cisco.com>2011-08-26 06:35:14 -0400
committerMauro Carvalho Chehab <mchehab@redhat.com>2011-09-21 08:52:21 -0400
commit88365105d683187e02a4f75220eaf51fd0c0b6e0 (patch)
treeacbc18b9e8eb7f74630fb7fd709cb35eafd30f54 /drivers/media/video/pwc
parent74a45790861f659058e8f8b565d98e5a1fdd8440 (diff)
[media] v4l2-ctrls: replace is_volatile with V4L2_CTRL_FLAG_VOLATILE
With the new flag there is no need anymore to have a separate is_volatile field. Modify all users to use the new flag. Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com> Acked-by: Hans de Goede <hdegoede@redhat.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/video/pwc')
-rw-r--r--drivers/media/video/pwc/pwc-v4l.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/media/video/pwc/pwc-v4l.c b/drivers/media/video/pwc/pwc-v4l.c
index 8c70e64444e7..6873bf50869f 100644
--- a/drivers/media/video/pwc/pwc-v4l.c
+++ b/drivers/media/video/pwc/pwc-v4l.c
@@ -640,7 +640,7 @@ static int pwc_set_awb(struct pwc_device *pdev)
640 return ret; 640 return ret;
641 641
642 /* Update val when coming from auto or going to a preset */ 642 /* Update val when coming from auto or going to a preset */
643 if (pdev->red_balance->is_volatile || 643 if ((pdev->red_balance->flags & V4L2_CTRL_FLAG_VOLATILE) ||
644 pdev->auto_white_balance->val == awb_indoor || 644 pdev->auto_white_balance->val == awb_indoor ||
645 pdev->auto_white_balance->val == awb_outdoor || 645 pdev->auto_white_balance->val == awb_outdoor ||
646 pdev->auto_white_balance->val == awb_fl) { 646 pdev->auto_white_balance->val == awb_fl) {
@@ -654,12 +654,12 @@ static int pwc_set_awb(struct pwc_device *pdev)
654 &pdev->blue_balance->val); 654 &pdev->blue_balance->val);
655 } 655 }
656 if (pdev->auto_white_balance->val == awb_auto) { 656 if (pdev->auto_white_balance->val == awb_auto) {
657 pdev->red_balance->is_volatile = true; 657 pdev->red_balance->flags |= V4L2_CTRL_FLAG_VOLATILE;
658 pdev->blue_balance->is_volatile = true; 658 pdev->blue_balance->flags |= V4L2_CTRL_FLAG_VOLATILE;
659 pdev->color_bal_valid = false; /* Force cache update */ 659 pdev->color_bal_valid = false; /* Force cache update */
660 } else { 660 } else {
661 pdev->red_balance->is_volatile = false; 661 pdev->red_balance->flags &= ~V4L2_CTRL_FLAG_VOLATILE;
662 pdev->blue_balance->is_volatile = false; 662 pdev->blue_balance->flags &= ~V4L2_CTRL_FLAG_VOLATILE;
663 } 663 }
664 } 664 }
665 665