Module Name: src
Committed By: riastradh
Date: Fri Apr 22 20:18:00 UTC 2016
Modified Files:
src/sys/external/bsd/drm2/dist/drm/nouveau: nouveau_connector.c
Log Message:
Sanity-check that the encoder we found is not null.
I think the previous code guarantees that finding this encoder should
work, so this should be a moot point.
CID 145720
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 \
src/sys/external/bsd/drm2/dist/drm/nouveau/nouveau_connector.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/external/bsd/drm2/dist/drm/nouveau/nouveau_connector.c
diff -u src/sys/external/bsd/drm2/dist/drm/nouveau/nouveau_connector.c:1.2 src/sys/external/bsd/drm2/dist/drm/nouveau/nouveau_connector.c:1.3
--- src/sys/external/bsd/drm2/dist/drm/nouveau/nouveau_connector.c:1.2 Wed Aug 6 15:01:33 2014
+++ src/sys/external/bsd/drm2/dist/drm/nouveau/nouveau_connector.c Fri Apr 22 20:17:59 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: nouveau_connector.c,v 1.2 2014/08/06 15:01:33 riastradh Exp $ */
+/* $NetBSD: nouveau_connector.c,v 1.3 2016/04/22 20:17:59 riastradh Exp $ */
/*
* Copyright (C) 2008 Maarten Maathuis.
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: nouveau_connector.c,v 1.2 2014/08/06 15:01:33 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nouveau_connector.c,v 1.3 2016/04/22 20:17:59 riastradh Exp $");
#include <acpi/button.h>
@@ -308,6 +308,7 @@ nouveau_connector_detect(struct drm_conn
type = DCB_OUTPUT_ANALOG;
nv_encoder = find_encoder(connector, type);
+ BUG_ON(nv_encoder == NULL);
}
nouveau_connector_set_encoder(connector, nv_encoder);
