diff options
Diffstat (limited to 'drivers/media/video/cx231xx/cx231xx-video.c')
-rw-r--r-- | drivers/media/video/cx231xx/cx231xx-video.c | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/drivers/media/video/cx231xx/cx231xx-video.c b/drivers/media/video/cx231xx/cx231xx-video.c index 6a524d847110..609bae6098d3 100644 --- a/drivers/media/video/cx231xx/cx231xx-video.c +++ b/drivers/media/video/cx231xx/cx231xx-video.c | |||
@@ -893,9 +893,9 @@ static int check_dev(struct cx231xx *dev) | |||
893 | return 0; | 893 | return 0; |
894 | } | 894 | } |
895 | 895 | ||
896 | void get_scale(struct cx231xx *dev, | 896 | static void get_scale(struct cx231xx *dev, |
897 | unsigned int width, unsigned int height, | 897 | unsigned int width, unsigned int height, |
898 | unsigned int *hscale, unsigned int *vscale) | 898 | unsigned int *hscale, unsigned int *vscale) |
899 | { | 899 | { |
900 | unsigned int maxw = norm_maxw(dev); | 900 | unsigned int maxw = norm_maxw(dev); |
901 | unsigned int maxh = norm_maxh(dev); | 901 | unsigned int maxh = norm_maxh(dev); |
@@ -907,10 +907,6 @@ void get_scale(struct cx231xx *dev, | |||
907 | *vscale = (((unsigned long)maxh) << 12) / height - 4096L; | 907 | *vscale = (((unsigned long)maxh) << 12) / height - 4096L; |
908 | if (*vscale >= 0x4000) | 908 | if (*vscale >= 0x4000) |
909 | *vscale = 0x3fff; | 909 | *vscale = 0x3fff; |
910 | |||
911 | dev->hscale = *hscale; | ||
912 | dev->vscale = *vscale; | ||
913 | |||
914 | } | 910 | } |
915 | 911 | ||
916 | /* ------------------------------------------------------------------ | 912 | /* ------------------------------------------------------------------ |