From e5f6da4521f5f3705bad629484c7131cbc04cdd7 Mon Sep 17 00:00:00 2001
From: Borislav Petkov <bp@alien8.de>
Date: Tue, 11 Dec 2012 16:05:26 +0100
Subject: [PATCH] --- yaml --- r: 353599 b: refs/heads/master c:
 f5e097f0465e874ac76e8b6ae355b6faa83973a1 h: refs/heads/master i:   353597:
 ecfc7f8f36210a7a621f4da0fc9f02ed085f3d4a   353595:
 34022be1eef3ee4c4f187811a43bb1e9430ad094   353591:
 d993373ec117024fa7c143a4c1ebc3a19a886046   353583:
 7f4dc194e15651f73a829ae72bcb50ae10118dc4   353567:
 ea0ec5c38ffd93ee9bfcfa1678b03df404b9ad08   353535:
 d3e4fdc3dda724c263171826595e2fdcb54a8635 v: v3

---
 [refs]                       | 2 +-
 trunk/drivers/base/dma-buf.c | 9 ++++-----
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/[refs] b/[refs]
index e1188f16c5cc..821211d37087 100644
--- 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
index a3f79c495a41..ff5b745c4705 100644
--- 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);