Module Name: src
Committed By: jmcneill
Date: Sat Apr 4 15:12:39 UTC 2015
Modified Files:
src/sys/external/bsd/drm2/i915drm: intelfb.c
src/sys/external/bsd/drm2/nouveau: nouveaufb.c
Log Message:
pmf_device_register returns false on failure, not true
To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 src/sys/external/bsd/drm2/i915drm/intelfb.c
cvs rdiff -u -r1.1 -r1.2 src/sys/external/bsd/drm2/nouveau/nouveaufb.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/i915drm/intelfb.c
diff -u src/sys/external/bsd/drm2/i915drm/intelfb.c:1.12 src/sys/external/bsd/drm2/i915drm/intelfb.c:1.13
--- src/sys/external/bsd/drm2/i915drm/intelfb.c:1.12 Thu Mar 5 17:56:39 2015
+++ src/sys/external/bsd/drm2/i915drm/intelfb.c Sat Apr 4 15:12:39 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: intelfb.c,v 1.12 2015/03/05 17:56:39 riastradh Exp $ */
+/* $NetBSD: intelfb.c,v 1.13 2015/04/04 15:12:39 jmcneill Exp $ */
/*-
* Copyright (c) 2014 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: intelfb.c,v 1.12 2015/03/05 17:56:39 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: intelfb.c,v 1.13 2015/04/04 15:12:39 jmcneill Exp $");
#include <sys/types.h>
#include <sys/bus.h>
@@ -180,7 +180,7 @@ intelfb_attach_task(struct i915drmkms_ta
return;
}
- if (pmf_device_register1(sc->sc_dev, NULL, NULL, &intelfb_shutdown))
+ if (!pmf_device_register1(sc->sc_dev, NULL, NULL, &intelfb_shutdown))
aprint_error_dev(sc->sc_dev,
"failed to register shutdown handler\n");
Index: src/sys/external/bsd/drm2/nouveau/nouveaufb.c
diff -u src/sys/external/bsd/drm2/nouveau/nouveaufb.c:1.1 src/sys/external/bsd/drm2/nouveau/nouveaufb.c:1.2
--- src/sys/external/bsd/drm2/nouveau/nouveaufb.c:1.1 Fri Mar 6 01:43:07 2015
+++ src/sys/external/bsd/drm2/nouveau/nouveaufb.c Sat Apr 4 15:12:39 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: nouveaufb.c,v 1.1 2015/03/06 01:43:07 riastradh Exp $ */
+/* $NetBSD: nouveaufb.c,v 1.2 2015/04/04 15:12:39 jmcneill Exp $ */
/*-
* Copyright (c) 2015 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: nouveaufb.c,v 1.1 2015/03/06 01:43:07 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nouveaufb.c,v 1.2 2015/04/04 15:12:39 jmcneill Exp $");
#include <sys/types.h>
#include <sys/bus.h>
@@ -158,7 +158,7 @@ nouveaufb_attach_task(struct nouveau_tas
return;
}
- if (pmf_device_register1(sc->sc_dev, NULL, NULL, &nouveaufb_shutdown))
+ if (!pmf_device_register1(sc->sc_dev, NULL, NULL, &nouveaufb_shutdown))
aprint_error_dev(sc->sc_dev,
"failed to register shutdown handler\n");
