aboutsummaryrefslogtreecommitdiffstats
path: root/usb
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@suse.de>2006-01-18 16:04:13 -0800
committerGreg Kroah-Hartman <gregkh@suse.de>2006-01-18 16:04:13 -0800
commit1a3570ed2d19741e14ca747557bd25a80519ec54 (patch)
treedd90ab995f85207da96e1cf79b31c7688633c37d /usb
parentba98b0119c5c4b5660cb4e1b357bcc31cb2d64d5 (diff)
downloadpatches-1a3570ed2d19741e14ca747557bd25a80519ec54.tar.gz
added usb patch
Diffstat (limited to 'usb')
-rw-r--r--usb/usb-kzalloc-for-hid.patch4
-rw-r--r--usb/usb-remove-misc-devfs-droppings.patch62
2 files changed, 64 insertions, 2 deletions
diff --git a/usb/usb-kzalloc-for-hid.patch b/usb/usb-kzalloc-for-hid.patch
index 135bda27e1d8ed..cbb5073b5fa82a 100644
--- a/usb/usb-kzalloc-for-hid.patch
+++ b/usb/usb-kzalloc-for-hid.patch
@@ -126,7 +126,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
}
--- gregkh-2.6.orig/drivers/usb/input/hiddev.c
+++ gregkh-2.6/drivers/usb/input/hiddev.c
-@@ -258,9 +258,8 @@ static int hiddev_open(struct inode * in
+@@ -257,9 +257,8 @@ static int hiddev_open(struct inode * in
if (i >= HIDDEV_MINORS || !hiddev_table[i])
return -ENODEV;
@@ -137,7 +137,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
list->hiddev = hiddev_table[i];
list->next = hiddev_table[i]->list;
-@@ -755,9 +754,8 @@ int hiddev_connect(struct hid_device *hi
+@@ -754,9 +753,8 @@ int hiddev_connect(struct hid_device *hi
if (i == hid->maxcollection && (hid->quirks & HID_QUIRK_HIDDEV) == 0)
return -1;
diff --git a/usb/usb-remove-misc-devfs-droppings.patch b/usb/usb-remove-misc-devfs-droppings.patch
new file mode 100644
index 00000000000000..94ed082d69d7b9
--- /dev/null
+++ b/usb/usb-remove-misc-devfs-droppings.patch
@@ -0,0 +1,62 @@
+From foo@baz.org Sun Jun 5 14:33:21 2005
+Date: Wed, 18 Jan 2006 17:36:58 -0500
+To: Greg KH <gregkh@suse.de>
+From: Greg Kroah-Hartman <gregkh@suse.de>
+Subject: USB: remove some left over devfs droppings hanging around in the usb drivers
+
+As there is no more usb devfs support, these bits would just confuse
+people.
+
+
+Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
+---
+ drivers/usb/input/hiddev.c | 3 ---
+ drivers/usb/misc/ldusb.c | 2 +-
+ drivers/usb/usb-skeleton.c | 2 +-
+ 3 files changed, 2 insertions(+), 5 deletions(-)
+
+--- gregkh-2.6.orig/drivers/usb/input/hiddev.c
++++ gregkh-2.6/drivers/usb/input/hiddev.c
+@@ -35,7 +35,6 @@
+ #include <linux/usb.h>
+ #include "hid.h"
+ #include <linux/hiddev.h>
+-#include <linux/devfs_fs_kernel.h>
+
+ #ifdef CONFIG_USB_DYNAMIC_MINORS
+ #define HIDDEV_MINOR_BASE 0
+@@ -832,12 +831,10 @@ static /* const */ struct usb_driver hid
+
+ int __init hiddev_init(void)
+ {
+- devfs_mk_dir("usb/hid");
+ return usb_register(&hiddev_driver);
+ }
+
+ void hiddev_exit(void)
+ {
+ usb_deregister(&hiddev_driver);
+- devfs_remove("usb/hid");
+ }
+--- gregkh-2.6.orig/drivers/usb/misc/ldusb.c
++++ gregkh-2.6/drivers/usb/misc/ldusb.c
+@@ -593,7 +593,7 @@ static struct file_operations ld_usb_fop
+
+ /*
+ * usb class driver info in order to get a minor number from the usb core,
+- * and to have the device registered with devfs and the driver core
++ * and to have the device registered with the driver core
+ */
+ static struct usb_class_driver ld_usb_class = {
+ .name = "ldusb%d",
+--- gregkh-2.6.orig/drivers/usb/usb-skeleton.c
++++ gregkh-2.6/drivers/usb/usb-skeleton.c
+@@ -234,7 +234,7 @@ static struct file_operations skel_fops
+
+ /*
+ * usb class driver info in order to get a minor number from the usb core,
+- * and to have the device registered with devfs and the driver core
++ * and to have the device registered with the driver core
+ */
+ static struct usb_class_driver skel_class = {
+ .name = "skel%d",