diff options
| author | russell <russell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-06-09 22:20:09 +0000 |
|---|---|---|
| committer | russell <russell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-06-09 22:20:09 +0000 |
| commit | 206ccd08dcd53713cf5fb2484a7edbc9336d3e83 (patch) | |
| tree | b933552659ff3d3d663d3db50214fb1a49dd7264 /channels/chan_oss.c | |
| parent | 912a2d74329263cf3673177d20e3ffdcfc5fd420 (diff) | |
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: http://svn.digium.com/svn/asterisk/branches/1.6.2@269502 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'channels/chan_oss.c')
| -rw-r--r-- | channels/chan_oss.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/channels/chan_oss.c b/channels/chan_oss.c index cf29b60a0..b5e49f0eb 100644 --- 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)); |