aboutsummaryrefslogtreecommitdiffstats
path: root/channels/chan_alsa.c
diff options
context:
space:
mode:
authormarkster <markster@f38db490-d61c-443f-a65b-d21fe96a405b>2004-06-26 14:19:38 +0000
committermarkster <markster@f38db490-d61c-443f-a65b-d21fe96a405b>2004-06-26 14:19:38 +0000
commita4b291c15f3a27d60396d2c225db88c850a31cd6 (patch)
treef6781c770c15ad0c291ff2b32e4cc4eed30e7967 /channels/chan_alsa.c
parent1e7a60f1b8fde718309b43f8aadfeeca74302dd3 (diff)
Minor alsa fixes, add "delayreject" option to IAX to implement request of bug #1846)
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@3313 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'channels/chan_alsa.c')
-rwxr-xr-xchannels/chan_alsa.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/channels/chan_alsa.c b/channels/chan_alsa.c
index 3a3054e2d..b8ae8b94c 100755
--- a/channels/chan_alsa.c
+++ b/channels/chan_alsa.c
@@ -634,7 +634,6 @@ static struct ast_frame *alsa_read(struct ast_channel *chan)
snd_pcm_prepare(alsa.icard);
} else if (r < 0) {
ast_log(LOG_ERROR, "Read error: %s\n", snd_strerror(r));
- return NULL;
} else if (r >= 0) {
off -= r;
}