Unverified Commit f755901c authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!13038 drm/shmem-helper: Remove errant put in error path 

Merge Pull Request from: @ci-robot 
 
PR sync from: Qi Xi <xiqi2@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/JRH37X7A4T45IHYGJCWPY2IOJSSKT7CX/ 
 
https://gitee.com/src-openeuler/kernel/issues/IAYRIR 
 
Link:https://gitee.com/openeuler/kernel/pulls/13038

 

Reviewed-by: default avatarXie XiuQi <xiexiuqi@huawei.com>
Signed-off-by: default avatarYang Yingliang <yangyingliang@huawei.com>
parents cd5b85df 458657c3

drivers/gpu/drm/drm_gem_shmem_helper.c

+1 −3
Original line number Diff line number Diff line
@@ -621,10 +621,8 @@ int drm_gem_shmem_mmap(struct drm_gem_object *obj, struct vm_area_struct *vma) 
	shmem = to_drm_gem_shmem_obj(obj);



	ret = drm_gem_shmem_get_pages(shmem);

	if (ret) {

		drm_gem_vm_close(vma);

	if (ret)

		return ret;

	}



	vma->vm_flags |= VM_MIXEDMAP | VM_DONTEXPAND;

	vma->vm_page_prot = vm_get_page_prot(vma->vm_flags);