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: https://origsvn.digium.com/svn/asterisk/branches/1.6.2@267538 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/channels/chan_usbradio.c b/channels/chan_usbradio.c
index 031af2780bd8f4cc5d783ce7bb5218208b5b7081..4a0984cddb12e187db6815953c8c8f9d2d55139c 100644 (file)
--- 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));