diff options
| author | Tejun Heo <tj@kernel.org> | 2014-02-08 10:37:44 -0500 |
|---|---|---|
| committer | Tejun Heo <tj@kernel.org> | 2014-02-08 10:37:44 -0500 |
| commit | f7cef064aa01a1ac682c1945cc168b878cb118ff (patch) | |
| tree | 5dc256a4e01689eed60ab3e7a7ab8e50c5bcf602 /drivers/gpu/drm/drm_prime.c | |
| parent | 1a698a4aba26dd58e8409d325a9a9db22f7cd2db (diff) | |
| parent | ba341d55a420ab4fdd1a53fd395fd59bd65de880 (diff) | |
Merge branch 'driver-core-next' into cgroup/for-3.15
Pending kernfs conversion depends on kernfs improvements in
driver-core-next. Pull it into for-3.15.
Signed-off-by: Tejun Heo <tj@kernel.org>
Diffstat (limited to 'drivers/gpu/drm/drm_prime.c')
| -rw-r--r-- | drivers/gpu/drm/drm_prime.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/drm_prime.c b/drivers/gpu/drm/drm_prime.c index 56805c39c90..bb516fdd195 100644 --- a/drivers/gpu/drm/drm_prime.c +++ b/drivers/gpu/drm/drm_prime.c @@ -471,7 +471,7 @@ struct drm_gem_object *drm_gem_prime_import(struct drm_device *dev, get_dma_buf(dma_buf); sgt = dma_buf_map_attachment(attach, DMA_BIDIRECTIONAL); - if (IS_ERR_OR_NULL(sgt)) { + if (IS_ERR(sgt)) { ret = PTR_ERR(sgt); goto fail_detach; } |