git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394...
[pandora-kernel.git]
/
drivers
/
media
/
dvb
/
dm1105
/
dm1105.c
diff --git
a/drivers/media/dvb/dm1105/dm1105.c
b/drivers/media/dvb/dm1105/dm1105.c
index
b762e56
..
bca07c0
100644
(file)
--- a/
drivers/media/dvb/dm1105/dm1105.c
+++ b/
drivers/media/dvb/dm1105/dm1105.c
@@
-594,7
+594,7
@@
static irqreturn_t dm1105_irq(int irq, void *dev_id)
int __devinit dm1105_ir_init(struct dm1105_dev *dm1105)
{
struct input_dev *input_dev;
- char *ir_codes =
NULL
;
+ char *ir_codes =
RC_MAP_DM1105_NEC
;
int err = -ENOMEM;
input_dev = input_allocate_device();