From 403f9df8d062fac7a757d4e5148674e4c76c4649 Mon Sep 17 00:00:00 2001 From: Russell Bryant Date: Wed, 9 Jun 2010 22:19:20 +0000 Subject: 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 --- channels/chan_oss.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'channels/chan_oss.c') 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)); -- cgit v1.2.3