[asterisk-commits] murf: trunk r61646 - in /trunk: ./ channels/chan_oss.c

[asterisk-commits at lists.digium.com]

Author: murf
Date: Fri Apr 13 12:11:53 2007
New Revision: 61646

URL: http://svn.digium.com/view/asterisk?view=rev&rev=61646
Log:
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.
........

Modified:
    trunk/   (props changed)
    trunk/channels/chan_oss.c

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.4-merged' - no diff available.

Modified: trunk/channels/chan_oss.c
URL: http://svn.digium.com/view/asterisk/trunk/channels/chan_oss.c?view=diff&rev=61646&r1=61645&r2=61646
==============================================================================
--- trunk/channels/chan_oss.c (original)
+++ trunk/channels/chan_oss.c Fri Apr 13 12:11:53 2007
@@ -1021,7 +1021,7 @@
 {
 	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;