diff --git a/sys/dev/drm/drm_auth.c b/sys/dev/drm/drm_auth.c
--- a/sys/dev/drm/drm_auth.c
+++ b/sys/dev/drm/drm_auth.c
@@ -194,11 +194,11 @@
 	 *
 	 * XXX fixme
 	 */
-	if (dev->master) {
-		kprintf("drm_setmaster_ioctl: already has one XXX ignored\n");
-		//ret = -EINVAL;
-		//goto out_unlock;
-	}
+	if (dev->master) {
+		DRM_ERROR("drm_setmaster_ioctl: dev already has a master\n");
+		ret = -EINVAL;
+		goto out_unlock;
+	}
 
 	if (!file_priv->master) {
 		kprintf("drm_setmaster_ioctl: file_priv->master already\n");