diff options
| author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2008-07-26 06:37:11 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2008-07-26 06:37:11 -0300 |
| commit | dd206111ac475d3fe5b1da56cfd0b54544ab0591 (patch) | |
| tree | 668e1afd2a1fada5599f547fa7b8b776320dd078 /linux/drivers/media/video/pvrusb2/pvrusb2-i2c-core.c | |
| parent | 6e93e0ba87ab3e1a0432b87337ca7985bd5c6a3d (diff) | |
| parent | 79e9f3261be47edf6b5a54b00fba99a355e1bec7 (diff) | |
| download | mediapointer-dvb-s2-dd206111ac475d3fe5b1da56cfd0b54544ab0591.tar.gz mediapointer-dvb-s2-dd206111ac475d3fe5b1da56cfd0b54544ab0591.tar.bz2 | |
merge: http://linuxtv.org/hg/~mcisely/pvrusb2
From: Mauro Carvalho Chehab <mchehab@infradead.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'linux/drivers/media/video/pvrusb2/pvrusb2-i2c-core.c')
| -rw-r--r-- | linux/drivers/media/video/pvrusb2/pvrusb2-i2c-core.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/linux/drivers/media/video/pvrusb2/pvrusb2-i2c-core.c b/linux/drivers/media/video/pvrusb2/pvrusb2-i2c-core.c index ef741d1fc..9159686c3 100644 --- a/linux/drivers/media/video/pvrusb2/pvrusb2-i2c-core.c +++ b/linux/drivers/media/video/pvrusb2/pvrusb2-i2c-core.c @@ -1054,7 +1054,9 @@ void pvr2_i2c_core_init(struct pvr2_hdw *hdw) printk(KERN_INFO "%s: IR disabled\n",hdw->name); hdw->i2c_func[0x18] = i2c_black_hole; } else if (ir_mode[hdw->unit_number] == 1) { - if (hdw->hdw_desc->flag_has_hauppauge_custom_ir) { + if (hdw->hdw_desc->ir_scheme == PVR2_IR_SCHEME_24XXX) { + /* This comment is present PURELY to get + checkpatch.pl to STFU. Lovely, eh? */ hdw->i2c_func[0x18] = i2c_24xxx_ir; } } |