diff options
| author | Russell Bryant <russell@russellbryant.com> | 2010-06-09 22:19:20 +0000 |
|---|---|---|
| committer | Russell Bryant <russell@russellbryant.com> | 2010-06-09 22:19:20 +0000 |
| commit | 403f9df8d062fac7a757d4e5148674e4c76c4649 (patch) | |
| tree | c6f11f4921af41aa59d99daecd5f17a9768681c3 /channels/chan_oss.c | |
| parent | dcc1b408b26199902265dffd00c6fa3c63f631f3 (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: https://origsvn.digium.com/svn/asterisk/trunk@269497 65c4cc65-6c06-0410-ace0-fbb531ad65f3
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 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)); |