diff options
| author | Ingo Molnar <mingo@kernel.org> | 2017-03-28 08:54:25 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2017-03-28 08:54:25 +0200 |
| commit | 4a96d1a5f0c51a0c991fb47160eca305ba628110 (patch) | |
| tree | 42a33c4a256f6353256e7a5b0edc4285d0a65901 /drivers/gpu/drm/omapdrm/omap_gem_dmabuf.c | |
| parent | 5204bf17031b69fa5faa4dc80a9dc1e2446d74f9 (diff) | |
| parent | cc66afea58f858ff6da7f79b8a595a67bbb4f9a9 (diff) | |
Merge branch 'ras/urgent' into ras/core, to pick up fix
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'drivers/gpu/drm/omapdrm/omap_gem_dmabuf.c')
| -rw-r--r-- | drivers/gpu/drm/omapdrm/omap_gem_dmabuf.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/drivers/gpu/drm/omapdrm/omap_gem_dmabuf.c b/drivers/gpu/drm/omapdrm/omap_gem_dmabuf.c index af267c35d813..ee5883f59be5 100644 --- a/drivers/gpu/drm/omapdrm/omap_gem_dmabuf.c +++ b/drivers/gpu/drm/omapdrm/omap_gem_dmabuf.c @@ -147,9 +147,6 @@ static int omap_gem_dmabuf_mmap(struct dma_buf *buffer, struct drm_gem_object *obj = buffer->priv; int ret = 0; - if (WARN_ON(!obj->filp)) - return -EINVAL; - ret = drm_gem_mmap_obj(obj, omap_gem_mmap_size(obj), vma); if (ret < 0) return ret; |