diff options
| author | russell <russell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-06-03 17:32:04 +0000 |
|---|---|---|
| committer | russell <russell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-06-03 17:32:04 +0000 |
| commit | 79043ac75cd3775b22b02675f4d7d14a8913cc93 (patch) | |
| tree | d79a4441fed2341c32317643e089ef73afa4697b /channels | |
| parent | c9d0869d4894e4bfd26002b877cc43aaa7b90c15 (diff) | |
Merged revisions 267537 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
........
r267537 | russell | 2010-06-03 12:31:41 -0500 (Thu, 03 Jun 2010) | 2 lines
Don't stop Asterisk if chan_usbradio isn't configured.
........
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.2@267538 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'channels')
| -rw-r--r-- | channels/chan_usbradio.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/channels/chan_usbradio.c b/channels/chan_usbradio.c index 031af2780..4a0984cdd 100644 --- a/channels/chan_usbradio.c +++ b/channels/chan_usbradio.c @@ -3976,12 +3976,12 @@ static int load_module(void) ast_log(LOG_NOTICE, "radio active device %s not found\n", usbradio_active); /* XXX we could default to 'dsp' perhaps ? */ /* XXX should cleanup allocated memory etc. */ - return AST_MODULE_LOAD_FAILURE; + return AST_MODULE_LOAD_DECLINE; } if (ast_channel_register(&usbradio_tech)) { ast_log(LOG_ERROR, "Unable to register channel type 'usb'\n"); - return AST_MODULE_LOAD_FAILURE; + return AST_MODULE_LOAD_DECLINE; } ast_cli_register_multiple(cli_usbradio, ARRAY_LEN(cli_usbradio)); |