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: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@114549 65c4cc65-6c06-0410-ace0-fbb531ad65f3

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) {