commit 71d4fa35a48caf34461c203769aab78f32b43fac
author Linux Build Service Account <lnxbuild@localhost> Tue Sep 18 16:34:06 2012 -0700
committer Gerrit - the friendly Code Review server <code-review@localhost> Tue Sep 18 16:34:03 2012 -0700
tree 992344ee106a63810d31349626210c5f88c57888
parent 353eabf0ae98a96392b0692ed7c6e3aa7e1d123f
parent 865e97f4943d9bf0c11763b694569fb4797c52b0

Merge "gpu: ion: IOCTL return success when error occurs"

drivers/gpu/ion/ion.c

diff --git a/drivers/gpu/ion/ion.c b/drivers/gpu/ion/ion.c
index 98254b5..7f760ed 100644
--- a/drivers/gpu/ion/ion.c
+++ b/drivers/gpu/ion/ion.c
@@ -1391,8 +1391,10 @@
 				   sizeof(struct ion_fd_data)))
 			return -EFAULT;
 		data.handle = ion_import_dma_buf(client, data.fd);
-		if (IS_ERR(data.handle))
+		if (IS_ERR(data.handle)) {
+			ret = PTR_ERR(data.handle);
 			data.handle = NULL;
+		}
 		if (copy_to_user((void __user *)arg, &data,
 				 sizeof(struct ion_fd_data)))
 			return -EFAULT;