diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-10-17 15:43:52 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-10-17 15:43:52 -0700 |
| commit | 0cfd81031a26717fe14380d18275f8e217571615 (patch) | |
| tree | 78a84e4cb97e7f45eb77dc0fbd8857a5dd717869 /drivers/usb/mon/mon_main.c | |
| parent | f7ea4a4ba84f382e8eb143e435551de0feee5b4b (diff) | |
| parent | 802f389a2cc6e2771b8de915ac241456d41eb79e (diff) | |
| download | kernel_replicant_linux-0cfd81031a26717fe14380d18275f8e217571615.tar.gz kernel_replicant_linux-0cfd81031a26717fe14380d18275f8e217571615.tar.bz2 kernel_replicant_linux-0cfd81031a26717fe14380d18275f8e217571615.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6: (94 commits)
USB: remove err() macro from more usb drivers
USB: remove err() macro from usb misc drivers
USB: remove err() macro from usb core code
USB: remove err() macro from usb class drivers
USB: remove use of err() in drivers/usb/serial
USB: remove info() macro from usb mtd drivers
USB: remove info() macro from usb input drivers
USB: remove info() macro from usb network drivers
USB: remove info() macro from remaining usb drivers
USB: remove info() macro from usb/misc drivers
USB: remove info() macro from usb/serial drivers
USB: remove warn macro from HID core
USB: remove warn() macro from usb drivers
USB: remove warn() macro from usb net drivers
USB: remove warn() macro from usb media drivers
USB: remove warn() macro from usb input drivers
usb/fsl_qe_udc: clear data toggle on clear halt request
usb/fsl_qe_udc: fix response to get status request
fsl_usb2_udc: Fix oops on probe failure.
fsl_usb2_udc: Add a wmb before priming endpoint.
...
Diffstat (limited to 'drivers/usb/mon/mon_main.c')
| -rw-r--r-- | drivers/usb/mon/mon_main.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/usb/mon/mon_main.c b/drivers/usb/mon/mon_main.c index 442d8076b201..5e0ab4201c00 100644 --- a/drivers/usb/mon/mon_main.c +++ b/drivers/usb/mon/mon_main.c @@ -361,12 +361,12 @@ static int __init mon_init(void) } // MOD_INC_USE_COUNT(which_module?); - usb_register_notify(&mon_nb); mutex_lock(&usb_bus_list_lock); list_for_each_entry (ubus, &usb_bus_list, bus_list) { mon_bus_init(ubus); } + usb_register_notify(&mon_nb); mutex_unlock(&usb_bus_list_lock); return 0; |