diff options
author | Hans Verkuil <hans.verkuil@cisco.com> | 2011-05-05 03:37:28 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2011-05-25 06:51:48 -0400 |
commit | c6ae804a65649d5919d232d65dc6a08c9e5ac01b (patch) | |
tree | 0fe436c54d5db23860bc6600c701455dd84b9a27 /drivers/media | |
parent | c9d5d7790cd7c9457772dc51381f0e0e4e691f68 (diff) |
[media] wl12xx: g_volatile_ctrl fix: wrong field set
The function g_volatile_ctrl should change the current value rather than the
new value. These two drivers didn't do that, so the value is never reported
correctly.
In the future this will change since this behavior is clearly unexpected,
but for now fix these drivers first.
Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media')
-rw-r--r-- | drivers/media/radio/radio-wl1273.c | 2 | ||||
-rw-r--r-- | drivers/media/radio/wl128x/fmdrv_v4l2.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/media/radio/radio-wl1273.c b/drivers/media/radio/radio-wl1273.c index e2550dc2944f..9dbbd31b5ba2 100644 --- a/drivers/media/radio/radio-wl1273.c +++ b/drivers/media/radio/radio-wl1273.c | |||
@@ -1382,7 +1382,7 @@ static int wl1273_fm_g_volatile_ctrl(struct v4l2_ctrl *ctrl) | |||
1382 | 1382 | ||
1383 | switch (ctrl->id) { | 1383 | switch (ctrl->id) { |
1384 | case V4L2_CID_TUNE_ANTENNA_CAPACITOR: | 1384 | case V4L2_CID_TUNE_ANTENNA_CAPACITOR: |
1385 | ctrl->val = wl1273_fm_get_tx_ctune(radio); | 1385 | ctrl->cur.val = wl1273_fm_get_tx_ctune(radio); |
1386 | break; | 1386 | break; |
1387 | 1387 | ||
1388 | default: | 1388 | default: |
diff --git a/drivers/media/radio/wl128x/fmdrv_v4l2.c b/drivers/media/radio/wl128x/fmdrv_v4l2.c index d50e5ac75ab6..87010724f914 100644 --- a/drivers/media/radio/wl128x/fmdrv_v4l2.c +++ b/drivers/media/radio/wl128x/fmdrv_v4l2.c | |||
@@ -191,7 +191,7 @@ static int fm_g_volatile_ctrl(struct v4l2_ctrl *ctrl) | |||
191 | 191 | ||
192 | switch (ctrl->id) { | 192 | switch (ctrl->id) { |
193 | case V4L2_CID_TUNE_ANTENNA_CAPACITOR: | 193 | case V4L2_CID_TUNE_ANTENNA_CAPACITOR: |
194 | ctrl->val = fm_tx_get_tune_cap_val(fmdev); | 194 | ctrl->cur.val = fm_tx_get_tune_cap_val(fmdev); |
195 | break; | 195 | break; |
196 | default: | 196 | default: |
197 | fmwarn("%s: Unknown IOCTL: %d\n", __func__, ctrl->id); | 197 | fmwarn("%s: Unknown IOCTL: %d\n", __func__, ctrl->id); |