aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/radio
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/radio
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/radio')
-rw-r--r--drivers/media/radio/radio-wl1273.c2
-rw-r--r--drivers/media/radio/wl128x/fmdrv_v4l2.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/media/radio/radio-wl1273.c b/drivers/media/radio/radio-wl1273.c
index 46cacf84504..6d1e4e750f6 100644
--- a/drivers/media/radio/radio-wl1273.c
+++ b/drivers/media/radio/radio-wl1273.c
@@ -2109,7 +2109,7 @@ static int __devinit wl1273_fm_radio_probe(struct platform_device *pdev)
2109 V4L2_CID_TUNE_ANTENNA_CAPACITOR, 2109 V4L2_CID_TUNE_ANTENNA_CAPACITOR,
2110 0, 255, 1, 255); 2110 0, 255, 1, 255);
2111 if (ctrl) 2111 if (ctrl)
2112 ctrl->is_volatile = 1; 2112 ctrl->flags |= V4L2_CTRL_FLAG_VOLATILE;
2113 2113
2114 if (radio->ctrl_handler.error) { 2114 if (radio->ctrl_handler.error) {
2115 r = radio->ctrl_handler.error; 2115 r = radio->ctrl_handler.error;
diff --git a/drivers/media/radio/wl128x/fmdrv_v4l2.c b/drivers/media/radio/wl128x/fmdrv_v4l2.c
index 478d1e93ada..aaee74752a8 100644
--- a/drivers/media/radio/wl128x/fmdrv_v4l2.c
+++ b/drivers/media/radio/wl128x/fmdrv_v4l2.c
@@ -559,7 +559,7 @@ int fm_v4l2_init_video_device(struct fmdev *fmdev, int radio_nr)
559 255, 1, 255); 559 255, 1, 255);
560 560
561 if (ctrl) 561 if (ctrl)
562 ctrl->is_volatile = 1; 562 ctrl->flags |= V4L2_CTRL_FLAG_VOLATILE;
563 563
564 return 0; 564 return 0;
565} 565}