Merge tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi

[karo-tx-linux.git] / drivers / base / dma-buf.c

diff --git a/drivers/base/dma-buf.c b/drivers/base/dma-buf.c
index a3f79c495a411ea85b87604ab473fcef6b962558..ff5b745c470525c5e1a19560cb81be188a76100c 100644 (file)
--- a/drivers/base/dma-buf.c
+++ b/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);