diff -u alsa-plugins-1.0.17/debian/patches/series alsa-plugins-1.0.17/debian/patches/series --- alsa-plugins-1.0.17/debian/patches/series +++ alsa-plugins-1.0.17/debian/patches/series @@ -1,0 +2 @@ +pulse_recording_fix.patch diff -u alsa-plugins-1.0.17/debian/changelog alsa-plugins-1.0.17/debian/changelog --- alsa-plugins-1.0.17/debian/changelog +++ alsa-plugins-1.0.17/debian/changelog @@ -1,3 +1,12 @@ +alsa-plugins (1.0.17-0ubuntu5) intrepid-proposed; urgency=low + + * debian/patches/pulse_recording_fix.patch: pa_stream_trigger() returns + NULL for capture, so test for it first. Spotted by Takashi Iwai and + acked by Lennart Poettering. + * LP: #282316 + + -- Daniel T Chen Mon, 27 Oct 2008 00:14:00 -0400 + alsa-plugins (1.0.17-0ubuntu4) intrepid; urgency=low * Revert commit b05f0176d1427586e411a91cda02a8877c5c8c0d from alsa-plugins only in patch2: unchanged: --- alsa-plugins-1.0.17.orig/debian/patches/pulse_recording_fix.patch +++ alsa-plugins-1.0.17/debian/patches/pulse_recording_fix.patch @@ -0,0 +1,27 @@ +Index: alsa-plugins-1.0.17/pulse/pcm_pulse.c +=================================================================== +--- alsa-plugins-1.0.17.orig/pulse/pcm_pulse.c 2008-10-27 00:11:20.000000000 -0400 ++++ alsa-plugins-1.0.17/pulse/pcm_pulse.c 2008-10-27 00:12:57.000000000 -0400 +@@ -145,18 +145,14 @@ + + u = pa_stream_trigger(pcm->stream, pulse_stream_success_cb, + pcm->p); +- if (!u) { +- pa_operation_unref(o); +- err = -EIO; +- goto finish; +- } +- + pcm->underrun = 0; + err_o = pulse_wait_operation(pcm->p, o); +- err_u = pulse_wait_operation(pcm->p, u); ++ if (u) ++ err_u = pulse_wait_operation(pcm->p, u); + + pa_operation_unref(o); +- pa_operation_unref(u); ++ if (u) ++ pa_operation_unref(u); + + if (err_o < 0 || err_u < 0) { + err = -EIO;