aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/video/hdpvr/hdpvr-core.c
diff options
context:
space:
mode:
authorAndy Walls <awalls@md.metrocast.net>2010-12-28 20:46:13 -0500
committerMauro Carvalho Chehab <mchehab@redhat.com>2010-12-30 09:17:14 -0500
commitea6c06033f01216df504b0f337a350778a3bc80e (patch)
tree3ec9ca9904c3aeff17f4a3b85f7294850c4175e8 /drivers/media/video/hdpvr/hdpvr-core.c
parent41ca2b1ac269e2ed64e2562b91fa61cab0b19e7a (diff)
[media] hdpvr: Add I2C and ir-kdb-i2c registration of the Zilog Z8 IR chip
Adds I2C registration of the Zilog Z8F0811 IR microcontroller for either lirc_zilog or ir-kbd-i2c to use. This is a required step in removing lirc_zilog's use of the deprecated struct i2c_adapter.id field. Signed-off-by: Andy Walls <awalls@md.metrocast.net> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/video/hdpvr/hdpvr-core.c')
-rw-r--r--drivers/media/video/hdpvr/hdpvr-core.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/media/video/hdpvr/hdpvr-core.c b/drivers/media/video/hdpvr/hdpvr-core.c
index b70d6afc9fec..f7d1ee55185a 100644
--- a/drivers/media/video/hdpvr/hdpvr-core.c
+++ b/drivers/media/video/hdpvr/hdpvr-core.c
@@ -385,6 +385,11 @@ static int hdpvr_probe(struct usb_interface *interface,
385 v4l2_err(&dev->v4l2_dev, "registering i2c adapter failed\n"); 385 v4l2_err(&dev->v4l2_dev, "registering i2c adapter failed\n");
386 goto error; 386 goto error;
387 } 387 }
388
389 /* until i2c is working properly */
390 retval = 0; /* hdpvr_register_i2c_ir(dev); */
391 if (retval < 0)
392 v4l2_err(&dev->v4l2_dev, "registering i2c IR devices failed\n");
388#endif /* CONFIG_I2C */ 393#endif /* CONFIG_I2C */
389 394
390 /* let the user know what node this device is now attached to */ 395 /* let the user know what node this device is now attached to */