From 1ec4a0d2b60fb3c8338ef4ea0fda119599957ea2 Mon Sep 17 00:00:00 2001
From: Jiri Slaby <jirislaby@gmail.com>
Date: Thu, 23 Oct 2008 01:47:34 +0200
Subject: [PATCH] --- yaml --- r: 117855 b: refs/heads/master c:
 eb9910894d7857c273e049b297fd6251e5ecc43e h: refs/heads/master i:   117853:
 f23a4e603a0671519666d1934463ed11a791672f   117851:
 62e1a3a41881bbbb8619e390a55c9b906a413197   117847:
 ea5bbb9d1924c7bd6000a45412e008932c6655b5   117839:
 61bbed52420f2014a2e787affdd7979da2bbacba   117823:
 deea774df8f43fc0fe923c06e2627f687da7e3ea v: v3

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

diff --git a/[refs] b/[refs]
index 13d21702fee4..49db3cb51623 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0f2c5945a917e776ccd394f0e1924e9502c2795f
+refs/heads/master: eb9910894d7857c273e049b297fd6251e5ecc43e
diff --git a/trunk/drivers/hid/usbhid/hiddev.c b/trunk/drivers/hid/usbhid/hiddev.c
index babd65dd46ad..3ac320785fc5 100644
--- a/trunk/drivers/hid/usbhid/hiddev.c
+++ b/trunk/drivers/hid/usbhid/hiddev.c
@@ -436,8 +436,7 @@ static noinline int hiddev_ioctl_usage(struct hiddev *hiddev, unsigned int cmd,
 		if (copy_to_user(user_arg, uref, sizeof(*uref)))
 			goto fault;
 
-		kfree(uref_multi);
-		return 0;
+		goto goodreturn;
 
 	default:
 		if (cmd != HIDIOCGUSAGE &&