diff options
| author | Marcin Slusarz <marcin.slusarz@gmail.com> | 2008-05-11 18:58:59 -0400 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2008-06-05 05:35:41 -0400 |
| commit | 427aad6fda607914945022e916827037d2d0db3d (patch) | |
| tree | 98c0b6167ba45fc7ea9d8652f45d64bdf34b5eb4 | |
| parent | 4d3437df25325d517ee310d55989ce9630ff529e (diff) | |
V4L/DVB (7905): check_v4l2 should return -EINVAL on error
check_v4l2 always returns 0, so this change is an noop for now,
but a comment says it will return something else in the future
Signed-off-by: Marcin Slusarz <marcin.slusarz@gmail.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
| -rw-r--r-- | drivers/media/video/tuner-core.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/media/video/tuner-core.c b/drivers/media/video/tuner-core.c index 1a9117457c8e..0d12ace61665 100644 --- a/drivers/media/video/tuner-core.c +++ b/drivers/media/video/tuner-core.c | |||
| @@ -792,7 +792,7 @@ static int tuner_command(struct i2c_client *client, unsigned int cmd, void *arg) | |||
| 792 | case VIDIOCSAUDIO: | 792 | case VIDIOCSAUDIO: |
| 793 | if (check_mode(t, "VIDIOCSAUDIO") == -EINVAL) | 793 | if (check_mode(t, "VIDIOCSAUDIO") == -EINVAL) |
| 794 | return 0; | 794 | return 0; |
| 795 | if (check_v4l2(t) == EINVAL) | 795 | if (check_v4l2(t) == -EINVAL) |
| 796 | return 0; | 796 | return 0; |
| 797 | 797 | ||
| 798 | /* Should be implemented, since bttv calls it */ | 798 | /* Should be implemented, since bttv calls it */ |
| @@ -810,7 +810,7 @@ static int tuner_command(struct i2c_client *client, unsigned int cmd, void *arg) | |||
| 810 | }; | 810 | }; |
| 811 | struct video_channel *vc = arg; | 811 | struct video_channel *vc = arg; |
| 812 | 812 | ||
| 813 | if (check_v4l2(t) == EINVAL) | 813 | if (check_v4l2(t) == -EINVAL) |
| 814 | return 0; | 814 | return 0; |
| 815 | 815 | ||
| 816 | if (set_mode(client,t,V4L2_TUNER_ANALOG_TV, "VIDIOCSCHAN")==-EINVAL) | 816 | if (set_mode(client,t,V4L2_TUNER_ANALOG_TV, "VIDIOCSCHAN")==-EINVAL) |
| @@ -829,7 +829,7 @@ static int tuner_command(struct i2c_client *client, unsigned int cmd, void *arg) | |||
| 829 | 829 | ||
| 830 | if (check_mode(t, "VIDIOCSFREQ") == -EINVAL) | 830 | if (check_mode(t, "VIDIOCSFREQ") == -EINVAL) |
| 831 | return 0; | 831 | return 0; |
| 832 | if (check_v4l2(t) == EINVAL) | 832 | if (check_v4l2(t) == -EINVAL) |
| 833 | return 0; | 833 | return 0; |
| 834 | 834 | ||
| 835 | set_freq(client, *v); | 835 | set_freq(client, *v); |
| @@ -841,7 +841,7 @@ static int tuner_command(struct i2c_client *client, unsigned int cmd, void *arg) | |||
| 841 | 841 | ||
| 842 | if (check_mode(t, "VIDIOCGTUNER") == -EINVAL) | 842 | if (check_mode(t, "VIDIOCGTUNER") == -EINVAL) |
| 843 | return 0; | 843 | return 0; |
| 844 | if (check_v4l2(t) == EINVAL) | 844 | if (check_v4l2(t) == -EINVAL) |
| 845 | return 0; | 845 | return 0; |
| 846 | 846 | ||
| 847 | if (V4L2_TUNER_RADIO == t->mode) { | 847 | if (V4L2_TUNER_RADIO == t->mode) { |
| @@ -885,7 +885,7 @@ static int tuner_command(struct i2c_client *client, unsigned int cmd, void *arg) | |||
| 885 | 885 | ||
| 886 | if (check_mode(t, "VIDIOCGAUDIO") == -EINVAL) | 886 | if (check_mode(t, "VIDIOCGAUDIO") == -EINVAL) |
| 887 | return 0; | 887 | return 0; |
| 888 | if (check_v4l2(t) == EINVAL) | 888 | if (check_v4l2(t) == -EINVAL) |
| 889 | return 0; | 889 | return 0; |
| 890 | 890 | ||
| 891 | if (V4L2_TUNER_RADIO == t->mode) { | 891 | if (V4L2_TUNER_RADIO == t->mode) { |