[asterisk-commits] russell: branch 1.6.2 r269502 - in /branches/1.6.2: ./ channels/chan_oss.c

[SVN commits to the Asterisk project]

Author: russell
Date: Wed Jun  9 17:20:09 2010
New Revision: 269502

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

................
  r269497 | russell | 2010-06-09 17:19:20 -0500 (Wed, 09 Jun 2010) | 9 lines
  
  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:
    branches/1.6.2/   (props changed)
    branches/1.6.2/channels/chan_oss.c

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

Modified: branches/1.6.2/channels/chan_oss.c
URL: http://svnview.digium.com/svn/asterisk/branches/1.6.2/channels/chan_oss.c?view=diff&rev=269502&r1=269501&r2=269502
==============================================================================
--- branches/1.6.2/channels/chan_oss.c (original)
+++ branches/1.6.2/channels/chan_oss.c Wed Jun  9 17:20:09 2010
@@ -1457,7 +1457,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));