aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJean-Francois Moine <moinejf@free.fr>2008-12-17 12:43:05 -0500
committerMauro Carvalho Chehab <mchehab@redhat.com>2008-12-30 06:39:40 -0500
commitf4b59e353239d3c8e2456a986e42f4c87cfcef9f (patch)
treebe1f5be0c55ec78ddbd7da527a172461a6975c17
parent35dc1b4cfa75dc0fa5ed44991b41db814e0f7741 (diff)
V4L/DVB (9986): gspca - spca561: Don't get the control values from the webcam.
Signed-off-by: Jean-Francois Moine <moinejf@free.fr> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
-rw-r--r--drivers/media/video/gspca/spca561.c38
1 files changed, 0 insertions, 38 deletions
diff --git a/drivers/media/video/gspca/spca561.c b/drivers/media/video/gspca/spca561.c
index 3a27faf60242..ee24629f0f5c 100644
--- a/drivers/media/video/gspca/spca561.c
+++ b/drivers/media/video/gspca/spca561.c
@@ -900,42 +900,6 @@ static void setbrightness(struct gspca_dev *gspca_dev)
900 reg_w_val(gspca_dev->dev, 0x8614, value); 900 reg_w_val(gspca_dev->dev, 0x8614, value);
901} 901}
902 902
903static void getbrightness(struct gspca_dev *gspca_dev)
904{
905 struct sd *sd = (struct sd *) gspca_dev;
906 __u16 tot;
907
908 tot = 0;
909 reg_r(gspca_dev, 0x8611, 1);
910 tot += gspca_dev->usb_buf[0];
911 reg_r(gspca_dev, 0x8612, 1);
912 tot += gspca_dev->usb_buf[0];
913 reg_r(gspca_dev, 0x8613, 1);
914 tot += gspca_dev->usb_buf[0];
915 reg_r(gspca_dev, 0x8614, 1);
916 tot += gspca_dev->usb_buf[0];
917 sd->brightness = tot >> 2;
918}
919
920/* rev72a only */
921static void getcontrast(struct gspca_dev *gspca_dev)
922{
923 struct sd *sd = (struct sd *) gspca_dev;
924 __u16 tot;
925
926 tot = 0;
927 reg_r(gspca_dev, 0x8651, 1);
928 tot += gspca_dev->usb_buf[0];
929 reg_r(gspca_dev, 0x8652, 1);
930 tot += gspca_dev->usb_buf[0];
931 reg_r(gspca_dev, 0x8653, 1);
932 tot += gspca_dev->usb_buf[0];
933 reg_r(gspca_dev, 0x8654, 1);
934 tot += gspca_dev->usb_buf[0];
935 sd->contrast = tot << 6;
936 PDEBUG(D_CONF, "get contrast %d", sd->contrast);
937}
938
939/* rev 72a only */ 903/* rev 72a only */
940static int sd_setbrightness(struct gspca_dev *gspca_dev, __s32 val) 904static int sd_setbrightness(struct gspca_dev *gspca_dev, __s32 val)
941{ 905{
@@ -951,7 +915,6 @@ static int sd_getbrightness(struct gspca_dev *gspca_dev, __s32 *val)
951{ 915{
952 struct sd *sd = (struct sd *) gspca_dev; 916 struct sd *sd = (struct sd *) gspca_dev;
953 917
954 getbrightness(gspca_dev);
955 *val = sd->brightness; 918 *val = sd->brightness;
956 return 0; 919 return 0;
957} 920}
@@ -971,7 +934,6 @@ static int sd_getcontrast(struct gspca_dev *gspca_dev, __s32 *val)
971{ 934{
972 struct sd *sd = (struct sd *) gspca_dev; 935 struct sd *sd = (struct sd *) gspca_dev;
973 936
974 getcontrast(gspca_dev);
975 *val = sd->contrast; 937 *val = sd->contrast;
976 return 0; 938 return 0;
977} 939}