From 1dc0a0dd6e5df819d792110e92440d6e0198e0a6 Mon Sep 17 00:00:00 2001
From: Amit Nagal <helloin.amit@gmail.com>
Date: Wed, 7 Sep 2011 13:48:47 +0200
Subject: [PATCH] --- yaml --- r: 264777 b: refs/heads/master c:
 1a8962317f494ad858971fc08ba035eff658a5c9 h: refs/heads/master i:   264775:
 f0b0c34fd70b2692875bb2b482945eccebb28de8 v: v3

---
 [refs]                     | 2 +-
 trunk/drivers/hid/hidraw.c | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index ed69ecfbceaa..818c43465300 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ba623a774f5b529f89b3d63e0837df52e16ffb3b
+refs/heads/master: 1a8962317f494ad858971fc08ba035eff658a5c9
diff --git a/trunk/drivers/hid/hidraw.c b/trunk/drivers/hid/hidraw.c
index c79578b5a788..c841a8e77339 100644
--- a/trunk/drivers/hid/hidraw.c
+++ b/trunk/drivers/hid/hidraw.c
@@ -259,7 +259,6 @@ static int hidraw_open(struct inode *inode, struct file *file)
 
 	mutex_lock(&minors_lock);
 	if (!hidraw_table[minor]) {
-		kfree(list);
 		err = -ENODEV;
 		goto out_unlock;
 	}
@@ -285,6 +284,8 @@ static int hidraw_open(struct inode *inode, struct file *file)
 out_unlock:
 	mutex_unlock(&minors_lock);
 out:
+	if (err < 0)
+		kfree(list);
 	return err;
 
 }