---

yaml --- r: 253750 b: refs/heads/master c: 5c699d7 h: refs/heads/master v: v3
git-mirror · May 26, 2011 · d6d5973 · d6d5973
1 parent c113c6e
commit d6d5973
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e23be0a27dcc9297ff0495360d89bc5b0bf12383
+refs/heads/master: 5c699d7d3f94ee1dd934edea889b32f8279a4e65
diff --git a/trunk/drivers/hid/usbhid/hiddev.c b/trunk/drivers/hid/usbhid/hiddev.c
@@ -248,12 +248,15 @@ static int hiddev_release(struct inode * inode, struct file * file)
 			usbhid_close(list->hiddev->hid);
 			usbhid_put_power(list->hiddev->hid);
 		} else {
+			mutex_unlock(&list->hiddev->existancelock);
 			kfree(list->hiddev);
+			kfree(list);
+			return 0;
 		}
 	}
 
-	kfree(list);
 	mutex_unlock(&list->hiddev->existancelock);
+	kfree(list);
 
 	return 0;
 }