diff --git a/ChangeLog b/ChangeLog
index 4c73112566..c5fb58ab3a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2006-02-17  Wim Taymans  <wim@fluendo.com>
+
+	* ext/alsa/gstalsasink.c: (gst_alsasink_open),
+	(gst_alsasink_reset):
+	Also release lock when we get an error in _reset();
+	fix an error message.
+
 2006-02-16  Tim-Philipp Müller  <tim at centricular dot net>
 
 	* ext/alsa/gstalsasink.c: (gst_alsasink_class_init),
diff --git a/ext/alsa/gstalsasink.c b/ext/alsa/gstalsasink.c
index 780dab620f..4cb1920399 100644
--- a/ext/alsa/gstalsasink.c
+++ b/ext/alsa/gstalsasink.c
@@ -713,7 +713,7 @@ gst_alsasink_open (GstAudioSink * asink)
 open_error:
   {
     if (err == -EBUSY) {
-      GST_ELEMENT_ERROR (alsa, RESOURCE, BUSY, (NULL), (NULL));
+      GST_ELEMENT_ERROR (alsa, RESOURCE, BUSY, (NULL), ("Device is busy"));
     } else {
       GST_ELEMENT_ERROR (alsa, RESOURCE, OPEN_WRITE,
           (NULL), ("Playback open error: %s", snd_strerror (err)));
@@ -941,12 +941,14 @@ drop_error:
   {
     GST_ELEMENT_ERROR (alsa, RESOURCE, SETTINGS,
         ("alsa-reset: pcm drop error: %s", snd_strerror (err)), (NULL));
+    GST_ALSA_UNLOCK (asink);
     return;
   }
 prepare_error:
   {
     GST_ELEMENT_ERROR (alsa, RESOURCE, SETTINGS,
         ("alsa-reset: pcm prepare error: %s", snd_strerror (err)), (NULL));
+    GST_ALSA_UNLOCK (asink);
     return;
   }
 }