kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-11-16 06:48:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged revisions 269497 via svnmerge from

Browse Source 
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
This commit is contained in:
Russell Bryant
2010-06-09 22:20:09 +00:00
parent 2fd6cbc156
commit 828a0e5b22
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
channels/chan_oss.c
View File

@@ -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));