Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Move setting of the usb_verbose_loaded flag into the module's init routine. 

This ensures that the flag is set even if the module was manually loaded
by the user rather than just auto-loaded.
This commit is contained in:
pgoyette 2010-07-25 13:19:27 +00:00
parent 1587dcc60f
commit 444ff5f1e3
2 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
sys/dev/usb/usb_subr.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: usb_subr.c,v 1.172 2010/07/20 20:56:06 drochner Exp $ */
/* $NetBSD: usb_subr.c,v 1.173 2010/07/25 13:19:27 pgoyette Exp $ */
/* $FreeBSD: src/sys/dev/usb/usb_subr.c,v 1.18 1999/11/17 22:33:47 n_hibma Exp $ */
/*
@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: usb_subr.c,v 1.172 2010/07/20 20:56:06 drochner Exp $");
__KERNEL_RCSID(0, "$NetBSD: usb_subr.c,v 1.173 2010/07/25 13:19:27 pgoyette Exp $");
#include "opt_compat_netbsd.h"
#include "opt_usbverbose.h"
@ -122,13 +122,11 @@ int usb_verbose_loaded = 0;
*/
void usb_load_verbose(void)
{
if (usb_verbose_loaded)
return;
mutex_enter(&module_lock);
if (module_autoload("usbverbose", MODULE_CLASS_MISC) == 0)
usb_verbose_loaded++;
mutex_exit(&module_lock);
if (usb_verbose_loaded == 0) {
mutex_enter(&module_lock);
module_autoload("usbverbose", MODULE_CLASS_MISC);
mutex_exit(&module_lock);
}
}
void get_usb_vendor_stub(char *v, usb_vendor_id_t v_id)

5
sys/dev/usb/usb_verbose.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: usb_verbose.c,v 1.2 2010/06/06 18:58:26 pgoyette Exp $ */
/* $NetBSD: usb_verbose.c,v 1.3 2010/07/25 13:19:27 pgoyette Exp $ */
/* $FreeBSD: src/sys/dev/usb/usb_subr.c,v 1.18 1999/11/17 22:33:47 n_hibma Exp $ */
/*
@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: usb_verbose.c,v 1.2 2010/06/06 18:58:26 pgoyette Exp $");
__KERNEL_RCSID(0, "$NetBSD: usb_verbose.c,v 1.3 2010/07/25 13:19:27 pgoyette Exp $");
#include <sys/param.h>
#include <sys/module.h>
@ -74,6 +74,7 @@ usbverbose_modcmd(modcmd_t cmd, void *arg)
saved_usb_product = get_usb_product;
get_usb_vendor = get_usb_vendor_real;
get_usb_product = get_usb_product_real;
usb_verbose_loaded = 1;
return 0;
case MODULE_CMD_FINI:
get_usb_vendor = saved_usb_vendor;