aboutsummaryrefslogtreecommitdiffstats
path: root/main
diff options
context:
space:
mode:
authorrussell <russell@f38db490-d61c-443f-a65b-d21fe96a405b>2008-04-22 20:27:09 +0000
committerrussell <russell@f38db490-d61c-443f-a65b-d21fe96a405b>2008-04-22 20:27:09 +0000
commitc2b4f2aab9ba141f562a65d4c64b5ae2ffc15ba4 (patch)
tree920d645810427007ef37de41e1c234f48f5ef3aa /main
parentbca6ca21155a996796e58c8841238faa57783036 (diff)
Merged revisions 114548 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk ........ r114548 | russell | 2008-04-22 15:25:56 -0500 (Tue, 22 Apr 2008) | 2 lines re-add a fix that got lost with a recent change ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@114549 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'main')
-rw-r--r--main/channel.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/main/channel.c b/main/channel.c
index 394fd9061..02c7451c1 100644
--- a/main/channel.c
+++ b/main/channel.c
@@ -2287,7 +2287,7 @@ static void ast_read_generator_actions(struct ast_channel *chan, struct ast_fram
* avoidance not to work in deeper functions
*/
ast_channel_unlock(chan);
- res = generate(chan, tmp, f->datalen, f->samples);
+ res = generate(chan, tmp, f->datalen, samples);
ast_channel_lock(chan);
chan->generatordata = tmp;
if (res) {