diff options
| author | russell <russell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-06-09 22:19:20 +0000 |
|---|---|---|
| committer | russell <russell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-06-09 22:19:20 +0000 |
| commit | 9eb7a04913632b127d1406e082be2dfbb76d592f (patch) | |
| tree | c6f11f4921af41aa59d99daecd5f17a9768681c3 /channels | |
| parent | 27f6aa441f0f755ead4669c3972e380b8e0d9912 (diff) | |
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/trunk@269497 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'channels')
| -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 414268576..aea48730f 100644 --- a/channels/chan_oss.c +++ b/channels/chan_oss.c @@ -1458,7 +1458,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)); |