[asterisk-commits] russell: trunk r269497 - in /trunk: ./ channels/chan_oss.c

[SVN commits to the Asterisk project]

Author: russell
Date: Wed Jun  9 17:19:20 2010
New Revision: 269497

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=269497
Log:
Merged revisions 269495 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
  r269495 | russell | 2010-06-09 17:18:37 -0500 (Wed, 09 Jun 2010) | 2 lines
  
  Don't stop Asterisk if chan_oss fails to register 'Console' (due to another channel driver already claiming it).
........

Modified:
    trunk/   (props changed)
    trunk/channels/chan_oss.c

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.4-merged' - no diff available.

Modified: trunk/channels/chan_oss.c
URL: http://svnview.digium.com/svn/asterisk/trunk/channels/chan_oss.c?view=diff&rev=269497&r1=269496&r2=269497
==============================================================================
--- trunk/channels/chan_oss.c (original)
+++ trunk/channels/chan_oss.c Wed Jun  9 17:19:20 2010
@@ -1458,7 +1458,7 @@
 
 	if (ast_channel_register(&oss_tech)) {
 		ast_log(LOG_ERROR, "Unable to register channel type 'OSS'\n");
-		return AST_MODULE_LOAD_FAILURE;
+		return AST_MODULE_LOAD_DECLINE;
 	}
 
 	ast_cli_register_multiple(cli_oss, ARRAY_LEN(cli_oss));