aboutsummaryrefslogtreecommitdiffstats
path: root/usb
diff options
authorGreg Kroah-Hartman <gregkh@suse.de>2009-04-30 07:29:47 -0700
committerGreg Kroah-Hartman <gregkh@suse.de>2009-04-30 07:29:47 -0700
commit3cbc89edf580728dd1224903514663e7f7ce8cf0 (patch)
tree8fe280ef7e18953fb42b736b1ba1a3c56469ff67 /usb
parent773ca126e2886b23814bdc4a9f041e144c43f9df (diff)
downloadpatches-3cbc89edf580728dd1224903514663e7f7ce8cf0.tar.gz
the real devtmpfs patch
Diffstat (limited to 'usb')
-rw-r--r--usb/usb-add-route-string-to-struct-usb_device.patch2
-rw-r--r--usb/usb-add-the-usbfs-devices-file-to-debugfs.patch2
-rw-r--r--usb/usb-add-usb-debugfs-directory.patch6
-rw-r--r--usb/usb-remove-unused-usb_host-class.patch6
-rw-r--r--usb/usb-support-for-addressing-a-usb-device-under-xhci.patch2
5 files changed, 9 insertions, 9 deletions
diff --git a/usb/usb-add-route-string-to-struct-usb_device.patch b/usb/usb-add-route-string-to-struct-usb_device.patch
index b2fdd740eb8922..8b43dbc12a837b 100644
--- a/usb/usb-add-route-string-to-struct-usb_device.patch
+++ b/usb/usb-add-route-string-to-struct-usb_device.patch
@@ -33,7 +33,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
--- a/drivers/usb/core/usb.c
+++ b/drivers/usb/core/usb.c
-@@ -376,18 +376,24 @@ struct usb_device *usb_alloc_dev(struct
+@@ -387,18 +387,24 @@ struct usb_device *usb_alloc_dev(struct
*/
if (unlikely(!parent)) {
dev->devpath[0] = '0';
diff --git a/usb/usb-add-the-usbfs-devices-file-to-debugfs.patch b/usb/usb-add-the-usbfs-devices-file-to-debugfs.patch
index 73ad17c89176dc..7a7930c18a586c 100644
--- a/usb/usb-add-the-usbfs-devices-file-to-debugfs.patch
+++ b/usb/usb-add-the-usbfs-devices-file-to-debugfs.patch
@@ -38,7 +38,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
obj-$(CONFIG_USB) += usbcore.o
--- a/drivers/usb/core/usb.c
+++ b/drivers/usb/core/usb.c
-@@ -1005,16 +1005,29 @@ static struct notifier_block usb_bus_nb
+@@ -1016,16 +1016,29 @@ static struct notifier_block usb_bus_nb
struct dentry *usb_debug_root;
EXPORT_SYMBOL_GPL(usb_debug_root);
diff --git a/usb/usb-add-usb-debugfs-directory.patch b/usb/usb-add-usb-debugfs-directory.patch
index 7193549f89f3fd..104f9703f2f5bd 100644
--- a/usb/usb-add-usb-debugfs-directory.patch
+++ b/usb/usb-add-usb-debugfs-directory.patch
@@ -23,7 +23,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
#include <asm/io.h>
#include <linux/scatterlist.h>
-@@ -1001,6 +1002,22 @@ static struct notifier_block usb_bus_nb
+@@ -1012,6 +1013,22 @@ static struct notifier_block usb_bus_nb
.notifier_call = usb_bus_notify,
};
@@ -46,7 +46,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
/*
* Init
*/
-@@ -1012,6 +1029,10 @@ static int __init usb_init(void)
+@@ -1023,6 +1040,10 @@ static int __init usb_init(void)
return 0;
}
@@ -57,7 +57,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
retval = ksuspend_usb_init();
if (retval)
goto out;
-@@ -1083,6 +1104,7 @@ static void __exit usb_exit(void)
+@@ -1094,6 +1115,7 @@ static void __exit usb_exit(void)
bus_unregister_notifier(&usb_bus_type, &usb_bus_nb);
bus_unregister(&usb_bus_type);
ksuspend_usb_cleanup();
diff --git a/usb/usb-remove-unused-usb_host-class.patch b/usb/usb-remove-unused-usb_host-class.patch
index 7f5117ed5afb21..29a7d7c87bbba6 100644
--- a/usb/usb-remove-unused-usb_host-class.patch
+++ b/usb/usb-remove-unused-usb_host-class.patch
@@ -76,7 +76,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
/**
--- a/drivers/usb/core/usb.c
+++ b/drivers/usb/core/usb.c
-@@ -1055,9 +1055,6 @@ static int __init usb_init(void)
+@@ -1066,9 +1066,6 @@ static int __init usb_init(void)
retval = bus_register_notifier(&usb_bus_type, &usb_bus_nb);
if (retval)
goto bus_notifier_failed;
@@ -86,7 +86,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
retval = usb_major_init();
if (retval)
goto major_init_failed;
-@@ -1087,8 +1084,6 @@ usb_devio_init_failed:
+@@ -1098,8 +1095,6 @@ usb_devio_init_failed:
driver_register_failed:
usb_major_cleanup();
major_init_failed:
@@ -95,7 +95,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
bus_unregister_notifier(&usb_bus_type, &usb_bus_nb);
bus_notifier_failed:
bus_unregister(&usb_bus_type);
-@@ -1113,7 +1108,6 @@ static void __exit usb_exit(void)
+@@ -1124,7 +1119,6 @@ static void __exit usb_exit(void)
usb_deregister(&usbfs_driver);
usb_devio_cleanup();
usb_hub_cleanup();
diff --git a/usb/usb-support-for-addressing-a-usb-device-under-xhci.patch b/usb/usb-support-for-addressing-a-usb-device-under-xhci.patch
index dad11b070a7aa4..19ff0f2fe19e41 100644
--- a/usb/usb-support-for-addressing-a-usb-device-under-xhci.patch
+++ b/usb/usb-support-for-addressing-a-usb-device-under-xhci.patch
@@ -228,7 +228,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
kfree(udev->product);
kfree(udev->manufacturer);
kfree(udev->serial);
-@@ -349,6 +354,13 @@ struct usb_device *usb_alloc_dev(struct
+@@ -360,6 +365,13 @@ struct usb_device *usb_alloc_dev(struct
kfree(dev);
return NULL;
}