Module Name: src
Committed By: riastradh
Date: Wed Jul 24 03:58:36 UTC 2013
Modified Files:
src/sys/external/bsd/drm2/drm [riastradh-drm2]: drm_drv.c
Log Message:
Let drm_fill_in_dev initialize dev->driver after all.
To generate a diff of this commit:
cvs rdiff -u -r1.1.2.19 -r1.1.2.20 src/sys/external/bsd/drm2/drm/drm_drv.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/drm/drm_drv.c
diff -u src/sys/external/bsd/drm2/drm/drm_drv.c:1.1.2.19 src/sys/external/bsd/drm2/drm/drm_drv.c:1.1.2.20
--- src/sys/external/bsd/drm2/drm/drm_drv.c:1.1.2.19 Wed Jul 24 03:58:19 2013
+++ src/sys/external/bsd/drm2/drm/drm_drv.c Wed Jul 24 03:58:36 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: drm_drv.c,v 1.1.2.19 2013/07/24 03:58:19 riastradh Exp $ */
+/* $NetBSD: drm_drv.c,v 1.1.2.20 2013/07/24 03:58:36 riastradh Exp $ */
/*-
* Copyright (c) 2013 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: drm_drv.c,v 1.1.2.19 2013/07/24 03:58:19 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: drm_drv.c,v 1.1.2.20 2013/07/24 03:58:36 riastradh Exp $");
#include <sys/param.h>
#include <sys/types.h>
@@ -271,7 +271,6 @@ drm_attach(device_t parent, device_t sel
sc->sc_initialized = false; /* paranoia */
- dev->driver = daa->daa_driver;
sc->sc_drm_dev = dev;
sc->sc_opencount = 0;
@@ -294,16 +293,13 @@ drm_attach(device_t parent, device_t sel
sizeof(sc->sc_minor[i].mode_group));
}
- /*
- * XXX drm_fill_in_dev reinitializes dev->driver as an artefact
- * of Linux's driver attachment goop. Harmless.
- */
- error = drm_fill_in_dev(dev, NULL, dev->driver);
+ error = drm_fill_in_dev(dev, NULL, daa->daa_driver);
if (error) {
aprint_error_dev(parent, "unable to initialize drm: %d\n",
error);
goto fail0;
}
+ KASSERT(dev->driver == daa->daa_driver);
if (dev->driver->load != NULL) {
error = (*dev->driver->load)(dev, daa->daa_flags);
