From 162d1e435d5f97be38d386cdc861bd5b2ee4e62a Mon Sep 17 00:00:00 2001 From: Hans de Goede Date: Sun, 3 Jul 2011 15:52:54 -0300 Subject: [PATCH] --- yaml --- r: 261455 b: refs/heads/master c: 51886df0ca8bcc42e13cad7bcfc3487268229cea h: refs/heads/master i: 261453: c348777cd88978bb240cd9696aabebb61561ce72 261451: 9ad51356daf63d84cf6238609ea59f9527b5ce1b 261447: 60163e7482c6c79b123a7ce51cb72fa1395c09a4 261439: 70cec654dd048feeb5e4482bf39e3cb36c6179b1 v: v3 --- [refs] | 2 +- trunk/drivers/media/video/pwc/pwc-if.c | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 9af85194642c..5166f20ed511 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 4bf7c61c8a1b026e4d3944fd58157795da10a246 +refs/heads/master: 51886df0ca8bcc42e13cad7bcfc3487268229cea diff --git a/trunk/drivers/media/video/pwc/pwc-if.c b/trunk/drivers/media/video/pwc/pwc-if.c index fdf113fe51c3..a5fe4a1532ac 100644 --- a/trunk/drivers/media/video/pwc/pwc-if.c +++ b/trunk/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 PWC_INFO("Logitech QuickCam 4000 Pro USB webcam detected.\n"); name = "Logitech QuickCam Pro 4000"; type_id = 740; /* CCD sensor */ + if (my_power_save == -1) + my_power_save = 1; break; case 0x08b3: 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 PWC_INFO("Logitech QuickCam Orbit/Sphere USB webcam detected.\n"); name = "Logitech QuickCam Orbit"; type_id = 740; /* CCD sensor */ + if (my_power_save == -1) + my_power_save = 1; features |= FEATURE_MOTOR_PANTILT; break; case 0x08b6: @@ -1070,6 +1074,8 @@ static int usb_pwc_probe(struct usb_interface *intf, const struct usb_device_id PWC_INFO("Creative Labs Webcam 5 detected.\n"); name = "Creative Labs Webcam 5"; type_id = 730; + if (my_power_save == -1) + my_power_save = 1; break; case 0x4011: PWC_INFO("Creative Labs Webcam Pro Ex detected.\n");