On Thu, Feb 06, 2003, Johannes Erdfelt <[EMAIL PROTECTED]> wrote:
> On Thu, Feb 06, 2003, Boris Duerner <[EMAIL PROTECTED]> wrote:
> > I use the usb_get_driver_np() function to get the name of the loaded driver 
> > for a usb device and I found that for a device using the usbmouse module the 
> > wrong driver name is returned. It gives me "usb_mouse" instead of usbmouse. 
> > the driver name is also wrong in /proc/bus/usb/drivers but correct in lsmod 
> > or /proc/modules resp.
> 
> The driver name in /proc/bus/usb/drivers is given differently than from
> /proc/modules.
> 
> I'm not exactly sure why the names are seperate, but it leads to
> situations like this where the names won't match for seemingly no good
> reason. The usbkbd driver was even worse, giving it's name as "keyboard".
> 
> Greg, can you apply this patch to 2.4? My 2.5 bk tree is a little messed
> up and I need to fix it before I can create a 2.5 patch. (Hopefully
> today)

And the 2.5 patch.

JE

# This is a BitKeeper generated patch for the following project:
# Project Name: greg k-h's linux 2.5 USB kernel tree
# This patch format is intended for GNU patch command version 2.5 or higher.
# This patch includes the following deltas:
#                  ChangeSet    1.921   -> 1.922  
#       drivers/usb/input/usbkbd.c      1.36    -> 1.37   
#       drivers/usb/input/usbmouse.c    1.32    -> 1.33   
#
# The following is the BitKeeper ChangeSet Log
# --------------------------------------------
# 03/02/06      [EMAIL PROTECTED]    1.922
# usbkbd.c:
#   Make the naming consistent 
# usbmouse.c:
#   Make the naming consistent
# --------------------------------------------
#
diff -Nru a/drivers/usb/input/usbkbd.c b/drivers/usb/input/usbkbd.c
--- a/drivers/usb/input/usbkbd.c        Thu Feb  6 08:15:18 2003
+++ b/drivers/usb/input/usbkbd.c        Thu Feb  6 08:15:18 2003
@@ -353,7 +353,7 @@
 MODULE_DEVICE_TABLE (usb, usb_kbd_id_table);
 
 static struct usb_driver usb_kbd_driver = {
-       .name =         "keyboard",
+       .name =         "usbkbd",
        .probe =        usb_kbd_probe,
        .disconnect =   usb_kbd_disconnect,
        .id_table =     usb_kbd_id_table,
diff -Nru a/drivers/usb/input/usbmouse.c b/drivers/usb/input/usbmouse.c
--- a/drivers/usb/input/usbmouse.c      Thu Feb  6 08:15:18 2003
+++ b/drivers/usb/input/usbmouse.c      Thu Feb  6 08:15:18 2003
@@ -237,7 +237,7 @@
 MODULE_DEVICE_TABLE (usb, usb_mouse_id_table);
 
 static struct usb_driver usb_mouse_driver = {
-       .name           = "usb_mouse",
+       .name           = "usbmouse",
        .probe          = usb_mouse_probe,
        .disconnect     = usb_mouse_disconnect,
        .id_table       = usb_mouse_id_table,


-------------------------------------------------------
This SF.NET email is sponsored by:
SourceForge Enterprise Edition + IBM + LinuxWorld = Something 2 See!
http://www.vasoftware.com
_______________________________________________
[EMAIL PROTECTED]
To unsubscribe, use the last form field at:
https://lists.sourceforge.net/lists/listinfo/linux-usb-devel

Reply via email to