summaryrefslogtreecommitdiffstats
path: root/drivers/media/video/hdpvr/hdpvr.h
diff options
context:
space:
mode:
authorJarod Wilson <jarod@redhat.com>2011-01-14 20:25:21 +0100
committerMauro Carvalho Chehab <mchehab@redhat.com>2011-01-19 15:52:20 +0100
commit324b04ba5da7918a2409f8113e46843bfbd89e67 (patch)
treeba998b90b4de1f7a825357fff03fc123a4884cc8 /drivers/media/video/hdpvr/hdpvr.h
parent[media] rc/mceusb: timeout should be in ns, not us (diff)
downloadlinux-324b04ba5da7918a2409f8113e46843bfbd89e67.tar.xz
linux-324b04ba5da7918a2409f8113e46843bfbd89e67.zip
[media] hdpvr: enable IR part
A number of things going on here, but the end result is that the IR part on the hdpvr gets enabled, and can be used with ir-kbd-i2c and/or lirc_zilog. First up, there are some conditional build fixes that come into play whether i2c is built-in or modular. Second, we're swapping out i2c_new_probed_device() for i2c_new_device(), as in my testing, probing always fails, but we *know* that all hdpvr devices have a z8 chip at 0x70 and 0x71. Third, we're poking at an i2c address directly without a client, and writing some magic bits to actually turn on this IR part (this could use some improvement in the future). Fourth, some of the i2c_adapter storage has been reworked, as the existing implementation used to lead to an oops following i2c changes c. 2.6.31. Earlier editions of this patch have been floating around the 'net for a while, including being patched into Fedora kernels, and they *do* work. This specific version isn't yet tested, beyond loading ir-kbd-i2c and confirming that it does bind to the RX address of the hdpvr. [mchehab@redhat.com: I2C_CLASS_TV_ANALOG is not defined. Fix compilation bug] Signed-off-by: Jarod Wilson <jarod@redhat.com> Acked-by: Andy Walls <awalls@md.metrocast.net> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/video/hdpvr/hdpvr.h')
-rw-r--r--drivers/media/video/hdpvr/hdpvr.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/video/hdpvr/hdpvr.h b/drivers/media/video/hdpvr/hdpvr.h
index 37f1e4c7675d..29f74269400c 100644
--- a/drivers/media/video/hdpvr/hdpvr.h
+++ b/drivers/media/video/hdpvr/hdpvr.h
@@ -106,7 +106,7 @@ struct hdpvr_device {
struct work_struct worker;
/* I2C adapter */
- struct i2c_adapter *i2c_adapter;
+ struct i2c_adapter i2c_adapter;
/* I2C lock */
struct mutex i2c_mutex;