---

yaml --- r: 353599 b: refs/heads/master c: f5e097f h: refs/heads/master i: 353597: ecfc7f8 353595: 34022be 353591: d993373 353583: 7f4dc19 353567: ea0ec5c 353535: d3e4fdc v: v3
git-mirror · Jan 17, 2013 · e5f6da4 · e5f6da4
1 parent 7c1716e
commit e5f6da4
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 6 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1a5d76dbe825fa6deba3d8979bbd334ea17b6dcc
+refs/heads/master: f5e097f0465e874ac76e8b6ae355b6faa83973a1
diff --git a/trunk/drivers/base/dma-buf.c b/trunk/drivers/base/dma-buf.c
@@ -134,15 +134,14 @@ EXPORT_SYMBOL_GPL(dma_buf_export);
  */
 int dma_buf_fd(struct dma_buf *dmabuf, int flags)
 {
-	int error, fd;
+	int fd;
 
 	if (!dmabuf || !dmabuf->file)
 		return -EINVAL;
 
-	error = get_unused_fd_flags(flags);
-	if (error < 0)
-		return error;
-	fd = error;
+	fd = get_unused_fd_flags(flags);
+	if (fd < 0)
+		return fd;
 
 	fd_install(fd, dmabuf->file);