From 3018b1af8b4d0721ec701f83aac5449ecb007e63 Mon Sep 17 00:00:00 2001
From: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Date: Thu, 26 Jan 2012 12:27:24 +0100
Subject: [PATCH] --- yaml --- r: 297192 b: refs/heads/master c:
 a9fbc3b73127efba9276e172daa8d122f0fac1a8 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 910a0ead6678..d605bc0db28e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d1aa06a1eaf5f751c9913703031d611599d8d3d7
+refs/heads/master: a9fbc3b73127efba9276e172daa8d122f0fac1a8
diff --git a/trunk/drivers/base/dma-buf.c b/trunk/drivers/base/dma-buf.c
index 198edd8a9f0a..97450a52172c 100644
--- a/trunk/drivers/base/dma-buf.c
+++ b/trunk/drivers/base/dma-buf.c
@@ -190,7 +190,7 @@ struct dma_buf_attachment *dma_buf_attach(struct dma_buf *dmabuf,
 
 	attach = kzalloc(sizeof(struct dma_buf_attachment), GFP_KERNEL);
 	if (attach == NULL)
-		goto err_alloc;
+		return ERR_PTR(-ENOMEM);
 
 	mutex_lock(&dmabuf->lock);
 
@@ -206,8 +206,6 @@ struct dma_buf_attachment *dma_buf_attach(struct dma_buf *dmabuf,
 	mutex_unlock(&dmabuf->lock);
 	return attach;
 
-err_alloc:
-	return ERR_PTR(-ENOMEM);
 err_attach:
 	kfree(attach);
 	mutex_unlock(&dmabuf->lock);