usb and i2c patch

2 files changed, 119 insertions, 3 deletions

diff --git a/usb/usb-dynamic-id-01.patch b/usb/usb-dynamic-id-01.patch
index 98f3a908f0b47..3addebcb18b55 100644
--- a/usb/usb-dynamic-id-01.patch
+++ b/usb/usb-dynamic-id-01.patch
@@ -631,7 +631,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
 +
 +	return NULL;
 +}
-+EXPORT_SYMBOL(usb_match_id);
++EXPORT_SYMBOL_GPL(usb_match_id);
 +
 +int usb_device_match(struct device *dev, struct device_driver *drv)
 +{
@@ -694,7 +694,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
 +
 +	return retval;
 +}
-+EXPORT_SYMBOL(usb_register);
++EXPORT_SYMBOL_GPL(usb_register);
 +
 +/**
 + * usb_deregister - unregister a USB driver
@@ -717,7 +717,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
 +
 +	usbfs_update_special();
 +}
-+EXPORT_SYMBOL(usb_deregister);
++EXPORT_SYMBOL_GPL(usb_deregister);
 --- gregkh-2.6.orig/drivers/usb/core/usb.h
 +++ gregkh-2.6/drivers/usb/core/usb.h
 @@ -33,6 +33,9 @@ extern void usb_host_cleanup(void);
diff --git a/usb/usb-fix-locking-for-usb-suspend-resume.patch b/usb/usb-fix-locking-for-usb-suspend-resume.patch
new file mode 100644
index 0000000000000..5ceca2672ecb3
--- /dev/null
+++ b/usb/usb-fix-locking-for-usb-suspend-resume.patch
@@ -0,0 +1,116 @@
+From stern@rowland.harvard.edu Mon Nov 21 08:41:04 2005
+Date: Mon, 21 Nov 2005 11:58:07 -0500 (EST)
+From: Alan Stern <stern@rowland.harvard.edu>
+To: Greg KH <greg@kroah.com>
+Subject: USB: Fix locking for USB suspend/resume
+Message-ID: <Pine.LNX.4.44L0.0511211151430.4586-100000@iolanthe.rowland.org>
+
+
+The earlier USB locking updates didn't touch the suspend/resume
+routines.  They need updating as well, since now the caller holds the
+device semaphore.  This patch (as608) makes the necessary changes.  It
+also adds a line to store the correct power state when a device is
+resumed, something which was unaccountably missing.
+
+Signed-off-by: Alan Stern <stern@rowland.harvard.edu>
+Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
+
+---
+ drivers/usb/core/hub.c |   54 +++++++++++++++++++++++++++++++++++--------------
+ 1 file changed, 39 insertions(+), 15 deletions(-)
+
+--- gregkh-2.6.orig/drivers/usb/core/hub.c
++++ gregkh-2.6/drivers/usb/core/hub.c
+@@ -1648,15 +1648,22 @@ static int __usb_suspend_device (struct 
+ int usb_suspend_device(struct usb_device *udev)
+ {
+ #ifdef	CONFIG_USB_SUSPEND
+-	int	port1, status;
++	int	port1;
+ 
+-	port1 = locktree(udev);
+-	if (port1 < 0)
+-		return port1;
++	if (udev->state == USB_STATE_NOTATTACHED)
++		return -ENODEV;
++	if (!udev->parent)
++		port1 = 0;
++	else {
++		for (port1 = udev->parent->maxchild; port1 > 0; --port1) {
++			if (udev->parent->children[port1-1] == udev)
++				break;
++		}
++		if (port1 == 0)
++			return -ENODEV;
++	}
+ 
+-	status = __usb_suspend_device(udev, port1);
+-	usb_unlock_device(udev);
+-	return status;
++	return __usb_suspend_device(udev, port1);
+ #else
+ 	/* NOTE:  udev->state unchanged, it's not lying ... */
+ 	udev->dev.power.power_state = PMSG_SUSPEND;
+@@ -1688,6 +1695,7 @@ static int finish_device_resume(struct u
+ 	usb_set_device_state(udev, udev->actconfig
+ 			? USB_STATE_CONFIGURED
+ 			: USB_STATE_ADDRESS);
++	udev->dev.power.power_state = PMSG_ON;
+ 
+  	/* 10.5.4.5 says be sure devices in the tree are still there.
+  	 * For now let's assume the device didn't go crazy on resume,
+@@ -1723,8 +1731,14 @@ static int finish_device_resume(struct u
+ 		 * may have a child resume event to deal with soon
+ 		 */
+ 		resume = udev->dev.bus->resume;
+-		for (i = 0; i < udev->actconfig->desc.bNumInterfaces; i++)
+-			(void) resume(&udev->actconfig->interface[i]->dev);
++		for (i = 0; i < udev->actconfig->desc.bNumInterfaces; i++) {
++			struct device *dev =
++					&udev->actconfig->interface[i]->dev;
++
++			down(&dev->sem);
++			(void) resume(dev);
++			up(&dev->sem);
++		}
+ 		status = 0;
+ 
+ 	} else if (udev->devnum <= 0) {
+@@ -1809,9 +1823,18 @@ int usb_resume_device(struct usb_device 
+ {
+ 	int	port1, status;
+ 
+-	port1 = locktree(udev);
+-	if (port1 < 0)
+-		return port1;
++	if (udev->state == USB_STATE_NOTATTACHED)
++		return -ENODEV;
++	if (!udev->parent)
++		port1 = 0;
++	else {
++		for (port1 = udev->parent->maxchild; port1 > 0; --port1) {
++			if (udev->parent->children[port1-1] == udev)
++				break;
++		}
++		if (port1 == 0)
++			return -ENODEV;
++	}
+ 
+ #ifdef	CONFIG_USB_SUSPEND
+ 	/* selective resume of one downstream hub-to-device port */
+@@ -1830,11 +1853,12 @@ int usb_resume_device(struct usb_device 
+ 		dev_dbg(&udev->dev, "can't resume, status %d\n",
+ 			status);
+ 
+-	usb_unlock_device(udev);
+-
+ 	/* rebind drivers that had no suspend() */
+-	if (status == 0)
++	if (status == 0) {
++		usb_unlock_device(udev);
+ 		bus_rescan_devices(&usb_bus_type);
++		usb_lock_device(udev);
++	}
+ 	return status;
+ }
+