diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2011-10-25 09:59:04 +0200 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2011-10-25 09:59:04 +0200 |
| commit | b3aec7b686329e6bb65aa08c7f9458f7fd512f06 (patch) | |
| tree | 67ae55567b5747f32ddd76dd63621bd2ca756a88 /drivers/hid/hidraw.c | |
| parent | Merge branch 'upstream-fixes' into for-linus (diff) | |
| parent | HID: Add device IDs for more SJOY adapters (diff) | |
| download | linux-b3aec7b686329e6bb65aa08c7f9458f7fd512f06.tar.xz linux-b3aec7b686329e6bb65aa08c7f9458f7fd512f06.zip | |
Merge branch 'upstream' into for-linus
Conflicts:
drivers/hid/hid-core.c
drivers/hid/hid-ids.h
Diffstat (limited to 'drivers/hid/hidraw.c')
| -rw-r--r-- | drivers/hid/hidraw.c | 3 |
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; } |