diff --git a/src/conf/virchrdev.c b/src/conf/virchrdev.c
index b5477b03d5..c9b2134e3b 100644
--- a/src/conf/virchrdev.c
+++ b/src/conf/virchrdev.c
@@ -237,12 +237,10 @@ static void virChrdevFDStreamCloseCb(virStreamPtr st G_GNUC_UNUSED,
                                       void *opaque)
 {
     virChrdevStreamInfo *priv = opaque;
-    virMutexLock(&priv->devs->lock);
+    VIR_LOCK_GUARD lock = virLockGuardLock(&priv->devs->lock);
 
     /* remove entry from hash */
     virHashRemoveEntry(priv->devs->hash, priv->path);
-
-    virMutexUnlock(&priv->devs->lock);
 }
 
 /**