rpms/kernel/F-7 kernel-2.6.spec, 1.3281, 1.3282 linux-2.6-usb-autosuspend-default-disable.patch, 1.3, 1.4

[Dave Jones (davej)]

Author: davej

Update of /cvs/pkgs/rpms/kernel/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27223

Modified Files:
	kernel-2.6.spec 
	linux-2.6-usb-autosuspend-default-disable.patch 
Log Message:
* Mon Jul 16 2007 Dave Jones <davej at redhat.com>
- Disable warnings that trigger due to disabled USB suspend.



Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-7/kernel-2.6.spec,v
retrieving revision 1.3281
retrieving revision 1.3282
diff -u -r1.3281 -r1.3282
--- kernel-2.6.spec	13 Jul 2007 22:27:22 -0000	1.3281
+++ kernel-2.6.spec	16 Jul 2007 13:40:19 -0000	1.3282
@@ -2174,6 +2174,9 @@
 %endif
 
 %changelog
+* Mon Jul 16 2007 Dave Jones <davej at redhat.com>
+- Disable warnings that trigger due to disabled USB suspend.
+
 * Fri Jul 13 2007 Chuck Ebbert <cebbert at redhat.com>
 - add more ATI SB700 ids to the ahci driver
 

linux-2.6-usb-autosuspend-default-disable.patch:

Index: linux-2.6-usb-autosuspend-default-disable.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-7/linux-2.6-usb-autosuspend-default-disable.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- linux-2.6-usb-autosuspend-default-disable.patch	10 Jul 2007 16:19:38 -0000	1.3
+++ linux-2.6-usb-autosuspend-default-disable.patch	16 Jul 2007 13:40:19 -0000	1.4
@@ -9,3 +9,14 @@
  						 * in seconds */
  module_param_named(autosuspend, usb_autosuspend_delay, int, 0644);
  MODULE_PARM_DESC(autosuspend, "default autosuspend delay");
+--- linux-2.6.22.noarch/drivers/usb/core/driver.c~	2007-07-16 09:31:54.000000000 -0400
++++ linux-2.6.22.noarch/drivers/usb/core/driver.c	2007-07-16 09:32:07.000000000 -0400
+@@ -1189,7 +1189,7 @@ static int usb_autopm_do_device(struct u
+ 	usb_pm_lock(udev);
+ 	udev->auto_pm = 1;
+ 	udev->pm_usage_cnt += inc_usage_cnt;
+-	WARN_ON(udev->pm_usage_cnt < 0);
++
+ 	if (inc_usage_cnt >= 0 && udev->pm_usage_cnt > 0) {
+ 		if (udev->state == USB_STATE_SUSPENDED)
+ 			status = usb_resume_both(udev);