rpms/kernel/FC-3 linux-2.6-pwc-powerup-by-default.patch,1.1,1.2

[fedora-cvs-commits at redhat.com]

Author: davej

Update of /cvs/dist/rpms/kernel/FC-3
In directory cvs.devel.redhat.com:/tmp/cvs-serv14577

Modified Files:
	linux-2.6-pwc-powerup-by-default.patch 
Log Message:
fix diff


linux-2.6-pwc-powerup-by-default.patch:
 pwc-if.c |    6 ++++++
 1 files changed, 6 insertions(+)

Index: linux-2.6-pwc-powerup-by-default.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-3/linux-2.6-pwc-powerup-by-default.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- linux-2.6-pwc-powerup-by-default.patch	24 Sep 2005 05:53:26 -0000	1.1
+++ linux-2.6-pwc-powerup-by-default.patch	28 Sep 2005 23:10:16 -0000	1.2
@@ -1,15 +1,15 @@
---- linux-2.6.12/drivers/usb/media/pwc/pwc-if.c~	2005-09-24 01:48:27.000000000 -0400
-+++ linux-2.6.12/drivers/usb/media/pwc/pwc-if.c	2005-09-24 01:52:13.000000000 -0400
-@@ -2120,6 +2120,12 @@ static int __init usb_pwc_init(void)
- 	}
- 	if (power_save)
- 		Info("Enabling power save on open/close.\n");
-+	else {
+--- linux-2.6.13/drivers/usb/media/pwc/pwc-if.c~	2005-09-28 18:59:49.000000000 -0400
++++ linux-2.6.13/drivers/usb/media/pwc/pwc-if.c	2005-09-28 19:09:08.000000000 -0400
+@@ -1946,6 +1946,12 @@ static int usb_pwc_probe(struct usb_inte
+ 	if (hint < MAX_DEV_HINTS) 
+ 		device_hint[hint].pdev = pdev;
+ 
++	if (!power_save) {
 +		i = pwc_camera_power(pdev, 1);
 +		if (i < 0)
 +			Info("Failed to power up the camera! (%d)\n", i);
 +	}
 +
- 	if (leds[0] >= 0)
- 		led_on = leds[0];
- 	if (leds[1] >= 0)
+ 	Trace(TRACE_PROBE, "probe() function returning struct at 0x%p.\n", pdev);
+ 	usb_set_intfdata (intf, pdev);
+ 	return 0;