projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'renesas-cleanup-for-v3.19' of git://git.kernel.org/pub/scm/linux/kernel...
[cascardo/linux.git]
/
drivers
/
media
/
usb
/
em28xx
/
em28xx-input.c
diff --git
a/drivers/media/usb/em28xx/em28xx-input.c
b/drivers/media/usb/em28xx/em28xx-input.c
index
581f6da
..
23f8f6a
100644
(file)
--- a/
drivers/media/usb/em28xx/em28xx-input.c
+++ b/
drivers/media/usb/em28xx/em28xx-input.c
@@
-712,8
+712,10
@@
static int em28xx_ir_init(struct em28xx *dev)
em28xx_info("Registering input extension\n");
ir = kzalloc(sizeof(*ir), GFP_KERNEL);
+ if (!ir)
+ return -ENOMEM;
rc = rc_allocate_device();
- if (!
ir || !
rc)
+ if (!rc)
goto error;
/* record handles to ourself */