diff options
| author | Mauro Carvalho Chehab <mchehab@redhat.com> | 2013-04-30 08:01:04 -0400 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2013-04-30 08:01:04 -0400 |
| commit | df90e2258950fd631cdbf322c1ee1f22068391aa (patch) | |
| tree | 0b6dd2717c04bb7f93db6abdeda208aeea4cd74e /drivers/media/radio/radio-timb.c | |
| parent | aad797c89903d570c17f6affc770eb98afd74e62 (diff) | |
| parent | 02615ed5e1b2283db2495af3cf8f4ee172c77d80 (diff) | |
Merge branch 'devel-for-v3.10' into v4l_for_linus
* patchwork: (831 commits)
[media] cx88: make core less verbose
[media] em28xx: fix oops at em28xx_dvb_bus_ctrl()
[media] s5c73m3: fix indentation of the help section in Kconfig
[media] cx25821-alsa: get rid of a __must_check warning
[media] cx25821-video: declare cx25821_vidioc_s_std as static
[media] cx25821-video: remove maxw from cx25821_vidioc_try_fmt_vid_cap
[media] r820t: Remove a warning for an unused value
[media] dib0090: Fix a warning at dib0090_set_EFUSE
[media] dib8000: fix a warning
[media] dib8000: Fix sub-channel range
[media] dib8000: store dtv_property_cache in a temp var
[media] dib8000: warning fix: declare internal functions as static
[media] r820t: quiet gcc warning on n_ring
[media] r820t: memory leak in release()
[media] r820t: precendence bug in r820t_xtal_check()
[media] videodev2.h: Remove the unused old V4L1 buffer types
[media] anysee: Grammar s/report the/report to/
[media] anysee: Initialize ret = 0 in anysee_frontend_attach()
[media] media: videobuf2: fix the length check for mmap
[media] em28xx: save isoc endpoint number for DVB only if endpoint has alt settings with xMaxPacketSize != 0
...
Conflicts:
drivers/media/pci/cx25821/cx25821-video.c
drivers/media/platform/Kconfig
Diffstat (limited to 'drivers/media/radio/radio-timb.c')
| -rw-r--r-- | drivers/media/radio/radio-timb.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/media/radio/radio-timb.c b/drivers/media/radio/radio-timb.c index b87effeb5dc6..bb7b143b65d1 100644 --- a/drivers/media/radio/radio-timb.c +++ b/drivers/media/radio/radio-timb.c | |||
| @@ -56,7 +56,7 @@ static int timbradio_vidioc_g_tuner(struct file *file, void *priv, | |||
| 56 | } | 56 | } |
| 57 | 57 | ||
| 58 | static int timbradio_vidioc_s_tuner(struct file *file, void *priv, | 58 | static int timbradio_vidioc_s_tuner(struct file *file, void *priv, |
| 59 | struct v4l2_tuner *v) | 59 | const struct v4l2_tuner *v) |
| 60 | { | 60 | { |
| 61 | struct timbradio *tr = video_drvdata(file); | 61 | struct timbradio *tr = video_drvdata(file); |
| 62 | return v4l2_subdev_call(tr->sd_tuner, tuner, s_tuner, v); | 62 | return v4l2_subdev_call(tr->sd_tuner, tuner, s_tuner, v); |
| @@ -91,7 +91,7 @@ static int timbradio_vidioc_s_audio(struct file *file, void *priv, | |||
| 91 | } | 91 | } |
| 92 | 92 | ||
| 93 | static int timbradio_vidioc_s_frequency(struct file *file, void *priv, | 93 | static int timbradio_vidioc_s_frequency(struct file *file, void *priv, |
| 94 | struct v4l2_frequency *f) | 94 | const struct v4l2_frequency *f) |
| 95 | { | 95 | { |
| 96 | struct timbradio *tr = video_drvdata(file); | 96 | struct timbradio *tr = video_drvdata(file); |
| 97 | return v4l2_subdev_call(tr->sd_tuner, tuner, s_frequency, f); | 97 | return v4l2_subdev_call(tr->sd_tuner, tuner, s_frequency, f); |