Merge branch 'upstream' into for-linus

Conflicts:
	drivers/hid/hid-core.c
	drivers/hid/hid-ids.h

1 files changed, 2 insertions, 1 deletions

diff --git a/drivers/hid/hidraw.c b/drivers/hid/hidraw.c
index 6d65d4e35120..cf7d6d58e79f 100644
--- a/drivers/hid/hidraw.c
+++ b/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;
         }
@@ -287,6 +286,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;
 
 }