diff --git a/ChangeLog b/ChangeLog
index 1c5002a6cc..176e024bde 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2008-08-30  Edward Hervey  <edward.hervey@collabora.co.uk>
+
+	* gst/gstpad.c: (gst_pad_get_internal_links_default):
+	Die evil deadlock, die !
+
 2008-08-30  Edward Hervey  <edward.hervey@collabora.co.uk>
 
 	* gst/gstutils.c: (gst_element_get_compatible_pad):
diff --git a/gst/gstpad.c b/gst/gstpad.c
index 83c5d71603..b8e240521b 100644
--- a/gst/gstpad.c
+++ b/gst/gstpad.c
@@ -2943,7 +2943,7 @@ gst_pad_get_internal_links_default (GstPad * pad)
 no_parent:
   {
     GST_DEBUG_OBJECT (pad, "no parent");
-    GST_OBJECT_LOCK (pad);
+    GST_OBJECT_UNLOCK (pad);
     return NULL;
   }
 }