Skip to content
Snippets Groups Projects
Commit bf3ca5fc authored by Ian Romanick's avatar Ian Romanick
Browse files

Second part of trunk-to-branch merge.

parent 228e3cb2
No related branches found
No related tags found
No related merge requests found
......@@ -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
......
......@@ -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
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment