From 2f256fc8f619a8bd18511aa79bc8f7b4eb58c453 Mon Sep 17 00:00:00 2001
From: Pavel Machek <pavel@ucw.cz>
Date: Sat, 21 Nov 2009 09:16:47 +0100
Subject: [PATCH] --- yaml --- r: 186504 b: refs/heads/master c:
 ccf972bd6bcb35ebd38e0a530c86088e45102aa4 h: refs/heads/master v: v3

---
 [refs]                                          | 2 +-
 trunk/drivers/staging/dream/camera/msm_camera.c | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 8a97e64e7566..21991629eec7 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e79753edf88d858a3783c946c12cc4726f6590f6
+refs/heads/master: ccf972bd6bcb35ebd38e0a530c86088e45102aa4
diff --git a/trunk/drivers/staging/dream/camera/msm_camera.c b/trunk/drivers/staging/dream/camera/msm_camera.c
index 7d938772eacc..87e118d18827 100644
--- a/trunk/drivers/staging/dream/camera/msm_camera.c
+++ b/trunk/drivers/staging/dream/camera/msm_camera.c
@@ -1885,8 +1885,10 @@ static int msm_open_control(struct inode *inode, struct file *filep)
 		return -ENOMEM;
 
 	rc = msm_open_common(inode, filep, 0);
-	if (rc < 0)
+	if (rc < 0) {
+		kfree(ctrl_pmsm);
 		return rc;
+	}
 
 	ctrl_pmsm->pmsm = filep->private_data;
 	filep->private_data = ctrl_pmsm;