diff options
| author | Mike Isely <isely@pobox.com> | 2008-07-25 17:35:31 -0500 |
|---|---|---|
| committer | Mike Isely <isely@pobox.com> | 2008-07-25 17:35:31 -0500 |
| commit | e52d829b9cb6bfd2ab0a4fa878f2e49133c0f10f (patch) | |
| tree | 88833dafd4cf0eb7018b7c560d824c8fe43410a8 /linux/drivers/media/video/pvrusb2/pvrusb2-i2c-core.c | |
| parent | e768886b19cdc2ba666bd52faa7797ff4151ced7 (diff) | |
| download | mediapointer-dvb-s2-e52d829b9cb6bfd2ab0a4fa878f2e49133c0f10f.tar.gz mediapointer-dvb-s2-e52d829b9cb6bfd2ab0a4fa878f2e49133c0f10f.tar.bz2 | |
pvrusb2: Enable IR chip on HVR-1900 class devices
From: Mike Isely <isely@pobox.com>
The Zilog IR chip on HVR-1900 devices is held in reset when the device
initializes. We have to bring this chip out of reset before LIRC has
any chance of operating the chip. So do it.
Signed-off-by: Mike Isely <isely@pobox.com>
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; } } |