From: Steve Murphy <murf@digium.com>
Date: Fri, 13 Apr 2007 17:11:53 +0000 (+0000)
Subject: Merged revisions 61644 via svnmerge from
X-Git-Tag: 1.6.0-beta1~3^2~2842
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=901413c76cbe34aa4e19467e8d511adcf4d134e1;p=thirdparty%2Fasterisk.git

Merged revisions 61644 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r61644 | murf | 2007-04-13 11:01:02 -0600 (Fri, 13 Apr 2007) | 1 line

A fix for chan_oss that resulted from the CDR changes; it helps to use the right info.
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@61646 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/channels/chan_oss.c b/channels/chan_oss.c
index d7344961db..4308e837d2 100644
--- a/channels/chan_oss.c
+++ b/channels/chan_oss.c
@@ -1021,7 +1021,7 @@ static struct ast_channel *oss_new(struct chan_oss_pvt *o, char *ext, char *ctx,
 {
 	struct ast_channel *c;
 
-	c = ast_channel_alloc(1, state, o->cid_num, o->cid_name, "", o->ext, o->ctx, 0, "OSS/%s", o->device + 5);
+	c = ast_channel_alloc(1, state, o->cid_num, o->cid_name, "", ext, ctx, 0, "OSS/%s", o->device + 5);
 	if (c == NULL)
 		return NULL;
 	c->tech = &oss_tech;