summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIan Romanick <idr@us.ibm.com>2003-04-04 02:59:48 +0000
committerIan Romanick <idr@us.ibm.com>2003-04-04 02:59:48 +0000
commitbf3ca5fc8bee5c8e6744660a54cc7910041b0943 (patch)
tree6a50136d07ac3a1dc2a63a4eeb7f007233530ced
parent228e3cb2e333f2a10c31ecbbc4f57a414cc63128 (diff)
Second part of trunk-to-branch merge.
-rw-r--r--bsd-core/drm_vm.c5
-rw-r--r--bsd/drm_vm.h5
2 files changed, 4 insertions, 6 deletions
diff --git a/bsd-core/drm_vm.c b/bsd-core/drm_vm.c
index 1ce0efab..5355b740 100644
--- a/bsd-core/drm_vm.c
+++ b/bsd-core/drm_vm.c
@@ -45,15 +45,14 @@ paddr_t DRM(mmap)(dev_t kdev, off_t offset, int prot)
drm_map_list_entry_t *listentry=NULL;
drm_file_t *priv;
-/* DRM_DEBUG("offset = 0x%x\n", offset);*/
-
priv = DRM(find_file_by_proc)(dev, DRM_CURPROC);
if (!priv) {
DRM_DEBUG("can't find authenticator\n");
return EINVAL;
}
- if (!priv->authenticated) return DRM_ERR(EACCES);
+ if (!priv->authenticated)
+ return DRM_ERR(EACCES);
if (dev->dma
&& offset >= 0
diff --git a/bsd/drm_vm.h b/bsd/drm_vm.h
index 1ce0efab..5355b740 100644
--- a/bsd/drm_vm.h
+++ b/bsd/drm_vm.h
@@ -45,15 +45,14 @@ paddr_t DRM(mmap)(dev_t kdev, off_t offset, int prot)
drm_map_list_entry_t *listentry=NULL;
drm_file_t *priv;
-/* DRM_DEBUG("offset = 0x%x\n", offset);*/
-
priv = DRM(find_file_by_proc)(dev, DRM_CURPROC);
if (!priv) {
DRM_DEBUG("can't find authenticator\n");
return EINVAL;
}
- if (!priv->authenticated) return DRM_ERR(EACCES);
+ if (!priv->authenticated)
+ return DRM_ERR(EACCES);
if (dev->dma
&& offset >= 0