Module Name: src
Committed By: riastradh
Date: Wed Jul 24 03:22:11 UTC 2013
Modified Files:
src/sys/external/bsd/drm2/drm [riastradh-drm2]: drm_fops.c
Log Message:
Compare dev->agp and dev->sg against NULL in drm_fops.c.
To generate a diff of this commit:
cvs rdiff -u -r1.1.2.4 -r1.1.2.5 src/sys/external/bsd/drm2/drm/drm_fops.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_fops.c
diff -u src/sys/external/bsd/drm2/drm/drm_fops.c:1.1.2.4 src/sys/external/bsd/drm2/drm/drm_fops.c:1.1.2.5
--- src/sys/external/bsd/drm2/drm/drm_fops.c:1.1.2.4 Wed Jul 24 02:45:38 2013
+++ src/sys/external/bsd/drm2/drm/drm_fops.c Wed Jul 24 03:22:11 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: drm_fops.c,v 1.1.2.4 2013/07/24 02:45:38 riastradh Exp $ */
+/* $NetBSD: drm_fops.c,v 1.1.2.5 2013/07/24 03:22:11 riastradh Exp $ */
/*-
* Copyright (c) 2013 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: drm_fops.c,v 1.1.2.4 2013/07/24 02:45:38 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: drm_fops.c,v 1.1.2.5 2013/07/24 03:22:11 riastradh Exp $");
#include <drm/drmP.h>
@@ -356,12 +356,12 @@ drm_lastclose(struct drm_device *dev)
mutex_lock(&dev->struct_mutex);
if (drm_core_has_AGP(dev) &&
- dev->agp &&
+ (dev->agp != NULL) &&
!drm_core_check_feature(dev, DRIVER_MODESET))
drm_lastclose_agp(dev);
if (drm_core_check_feature(dev, DRIVER_SG) &&
- dev->sg &&
+ (dev->sg != NULL) &&
!drm_core_check_feature(dev, DRIVER_MODESET)) {
drm_sg_cleanup(dev->sg);
dev->sg = NULL;
