diff options
Diffstat (limited to 'drivers/media/pci/cx88/cx88-video.c')
-rw-r--r-- | drivers/media/pci/cx88/cx88-video.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/drivers/media/pci/cx88/cx88-video.c b/drivers/media/pci/cx88/cx88-video.c index bc78354262ac..4f10875295e8 100644 --- a/drivers/media/pci/cx88/cx88-video.c +++ b/drivers/media/pci/cx88/cx88-video.c | |||
@@ -1321,8 +1321,10 @@ static int vidioc_g_frequency (struct file *file, void *priv, | |||
1321 | } | 1321 | } |
1322 | 1322 | ||
1323 | int cx88_set_freq (struct cx88_core *core, | 1323 | int cx88_set_freq (struct cx88_core *core, |
1324 | struct v4l2_frequency *f) | 1324 | const struct v4l2_frequency *f) |
1325 | { | 1325 | { |
1326 | struct v4l2_frequency new_freq = *f; | ||
1327 | |||
1326 | if (unlikely(UNSET == core->board.tuner_type)) | 1328 | if (unlikely(UNSET == core->board.tuner_type)) |
1327 | return -EINVAL; | 1329 | return -EINVAL; |
1328 | if (unlikely(f->tuner != 0)) | 1330 | if (unlikely(f->tuner != 0)) |
@@ -1331,8 +1333,8 @@ int cx88_set_freq (struct cx88_core *core, | |||
1331 | mutex_lock(&core->lock); | 1333 | mutex_lock(&core->lock); |
1332 | cx88_newstation(core); | 1334 | cx88_newstation(core); |
1333 | call_all(core, tuner, s_frequency, f); | 1335 | call_all(core, tuner, s_frequency, f); |
1334 | call_all(core, tuner, g_frequency, f); | 1336 | call_all(core, tuner, g_frequency, &new_freq); |
1335 | core->freq = f->frequency; | 1337 | core->freq = new_freq.frequency; |
1336 | 1338 | ||
1337 | /* When changing channels it is required to reset TVAUDIO */ | 1339 | /* When changing channels it is required to reset TVAUDIO */ |
1338 | msleep (10); | 1340 | msleep (10); |
@@ -1345,7 +1347,7 @@ int cx88_set_freq (struct cx88_core *core, | |||
1345 | EXPORT_SYMBOL(cx88_set_freq); | 1347 | EXPORT_SYMBOL(cx88_set_freq); |
1346 | 1348 | ||
1347 | static int vidioc_s_frequency (struct file *file, void *priv, | 1349 | static int vidioc_s_frequency (struct file *file, void *priv, |
1348 | struct v4l2_frequency *f) | 1350 | const struct v4l2_frequency *f) |
1349 | { | 1351 | { |
1350 | struct cx8800_fh *fh = priv; | 1352 | struct cx8800_fh *fh = priv; |
1351 | struct cx88_core *core = fh->dev->core; | 1353 | struct cx88_core *core = fh->dev->core; |