aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/video/pwc
diff options
context:
space:
mode:
authorHans de Goede <hdegoede@redhat.com>2011-07-03 14:52:54 -0400
committerMauro Carvalho Chehab <mchehab@redhat.com>2011-07-27 16:55:37 -0400
commit51886df0ca8bcc42e13cad7bcfc3487268229cea (patch)
treeaaa470c13d0cb97f86a77693c03bb00de5216a20 /drivers/media/video/pwc
parent4bf7c61c8a1b026e4d3944fd58157795da10a246 (diff)
[media] pwc: Enable power-management by default on tested models
Signed-off-by: Hans de Goede <hdegoede@redhat.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/video/pwc')
-rw-r--r--drivers/media/video/pwc/pwc-if.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/drivers/media/video/pwc/pwc-if.c b/drivers/media/video/pwc/pwc-if.c
index fdf113fe51c3..a5fe4a1532ac 100644
--- a/drivers/media/video/pwc/pwc-if.c
+++ b/drivers/media/video/pwc/pwc-if.c
@@ -999,6 +999,8 @@ static int usb_pwc_probe(struct usb_interface *intf, const struct usb_device_id
999 PWC_INFO("Logitech QuickCam 4000 Pro USB webcam detected.\n"); 999 PWC_INFO("Logitech QuickCam 4000 Pro USB webcam detected.\n");
1000 name = "Logitech QuickCam Pro 4000"; 1000 name = "Logitech QuickCam Pro 4000";
1001 type_id = 740; /* CCD sensor */ 1001 type_id = 740; /* CCD sensor */
1002 if (my_power_save == -1)
1003 my_power_save = 1;
1002 break; 1004 break;
1003 case 0x08b3: 1005 case 0x08b3:
1004 PWC_INFO("Logitech QuickCam Zoom USB webcam detected.\n"); 1006 PWC_INFO("Logitech QuickCam Zoom USB webcam detected.\n");
@@ -1016,6 +1018,8 @@ static int usb_pwc_probe(struct usb_interface *intf, const struct usb_device_id
1016 PWC_INFO("Logitech QuickCam Orbit/Sphere USB webcam detected.\n"); 1018 PWC_INFO("Logitech QuickCam Orbit/Sphere USB webcam detected.\n");
1017 name = "Logitech QuickCam Orbit"; 1019 name = "Logitech QuickCam Orbit";
1018 type_id = 740; /* CCD sensor */ 1020 type_id = 740; /* CCD sensor */
1021 if (my_power_save == -1)
1022 my_power_save = 1;
1019 features |= FEATURE_MOTOR_PANTILT; 1023 features |= FEATURE_MOTOR_PANTILT;
1020 break; 1024 break;
1021 case 0x08b6: 1025 case 0x08b6:
@@ -1070,6 +1074,8 @@ static int usb_pwc_probe(struct usb_interface *intf, const struct usb_device_id
1070 PWC_INFO("Creative Labs Webcam 5 detected.\n"); 1074 PWC_INFO("Creative Labs Webcam 5 detected.\n");
1071 name = "Creative Labs Webcam 5"; 1075 name = "Creative Labs Webcam 5";
1072 type_id = 730; 1076 type_id = 730;
1077 if (my_power_save == -1)
1078 my_power_save = 1;
1073 break; 1079 break;
1074 case 0x4011: 1080 case 0x4011:
1075 PWC_INFO("Creative Labs Webcam Pro Ex detected.\n"); 1081 PWC_INFO("Creative Labs Webcam Pro Ex detected.\n");