diff options
| author | Takashi Iwai <tiwai@suse.de> | 2011-03-28 07:03:58 -0400 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2011-03-28 07:03:58 -0400 |
| commit | cdccfc8dc0bf62a1da327324a8d639139acc9279 (patch) | |
| tree | dca7934b27d510c9c006558979ebc48e07a531cf /drivers/media/radio/radio-si4713.c | |
| parent | b21a8ee67013372f439fbd1591e91d09de49bb9c (diff) | |
| parent | c6b358748e19ce7e230b0926ac42696bc485a562 (diff) | |
Merge branch 'fix/misc' into topic/misc
Diffstat (limited to 'drivers/media/radio/radio-si4713.c')
| -rw-r--r-- | drivers/media/radio/radio-si4713.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/media/radio/radio-si4713.c b/drivers/media/radio/radio-si4713.c index 726d367ad8d0..444b4cf7e65c 100644 --- a/drivers/media/radio/radio-si4713.c +++ b/drivers/media/radio/radio-si4713.c | |||
| @@ -224,7 +224,8 @@ static int radio_si4713_s_frequency(struct file *file, void *p, | |||
| 224 | s_frequency, vf); | 224 | s_frequency, vf); |
| 225 | } | 225 | } |
| 226 | 226 | ||
| 227 | static long radio_si4713_default(struct file *file, void *p, int cmd, void *arg) | 227 | static long radio_si4713_default(struct file *file, void *p, |
| 228 | bool valid_prio, int cmd, void *arg) | ||
| 228 | { | 229 | { |
| 229 | return v4l2_device_call_until_err(get_v4l2_dev(file), 0, core, | 230 | return v4l2_device_call_until_err(get_v4l2_dev(file), 0, core, |
| 230 | ioctl, cmd, arg); | 231 | ioctl, cmd, arg); |