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).
  ........
................

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.2@269502 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/channels/chan_oss.c b/channels/chan_oss.c
index cf29b60a05e1af28849e90963a692dcb05c7b70d..b5e49f0eb6554fe2f30dba2ff57d9eb4bfc81339 100644 (file)
--- a/channels/chan_oss.c
+++ b/channels/chan_oss.c
@@ -1457,7 +1457,7 @@ static int load_module(void)
 
        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));