[asterisk-commits] russell: branch 1.6.2 r267538 - in /branches/1.6.2: ./ channels/chan_usbradio.c

[SVN commits to the Asterisk project]

Author: russell
Date: Thu Jun  3 12:32:04 2010
New Revision: 267538

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=267538
Log:
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.
........

Modified:
    branches/1.6.2/   (props changed)
    branches/1.6.2/channels/chan_usbradio.c

Propchange: branches/1.6.2/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.2/channels/chan_usbradio.c
URL: http://svnview.digium.com/svn/asterisk/branches/1.6.2/channels/chan_usbradio.c?view=diff&rev=267538&r1=267537&r2=267538
==============================================================================
--- branches/1.6.2/channels/chan_usbradio.c (original)
+++ branches/1.6.2/channels/chan_usbradio.c Thu Jun  3 12:32:04 2010
@@ -3976,12 +3976,12 @@
 		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));