diff --git a/ChangeLog b/ChangeLog
index 1c4de1f88a..46495007ef 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2008-04-24  Edward Hervey  <edward.hervey@collabora.co.uk>
+
+	* ext/alsa/gstalsadeviceprobe.c:
+	(gst_alsa_get_device_list): Don't return before freeing up
+	the allocated structures.
+
 2008-04-24  Stefan Kost  <ensonic@users.sf.net>
 
 	* gst/playback/gstplaybin.c:
diff --git a/ext/alsa/gstalsadeviceprobe.c b/ext/alsa/gstalsadeviceprobe.c
index 7094c4714b..a4d8ecf5a2 100644
--- a/ext/alsa/gstalsadeviceprobe.c
+++ b/ext/alsa/gstalsadeviceprobe.c
@@ -67,7 +67,8 @@ gst_alsa_get_device_list (snd_pcm_stream_t stream)
 
   if (snd_card_next (&card) < 0 || card < 0) {
     /* no soundcard found */
-    return NULL;
+    GST_WARNING ("No soundcard found");
+    goto beach;
   }
 
   while (card >= 0) {
@@ -111,6 +112,7 @@ gst_alsa_get_device_list (snd_pcm_stream_t stream)
     }
   }
 
+beach:
   snd_ctl_card_info_free (info);
   snd_pcm_info_free (pcminfo);