summaryrefslogtreecommitdiff
path: root/linux/drivers/media/dvb/cinergyT2
diff options
context:
space:
mode:
authorHartmut Hackmann <hartmut.hackmann@t-online.de>2007-02-17 01:16:41 +0100
committerHartmut Hackmann <hartmut.hackmann@t-online.de>2007-02-17 01:16:41 +0100
commit5a728a822e3d6d1fc62e86410ec71cb87504f08b (patch)
tree63be62ced84f42da611fe8cda64da85e39a76337 /linux/drivers/media/dvb/cinergyT2
parent4850e008216efdfb888352955d0d166d7363743c (diff)
parent14f8694a006fc440ea2f5f18aaefd3ff7d98e313 (diff)
downloadmediapointer-dvb-s2-5a728a822e3d6d1fc62e86410ec71cb87504f08b.tar.gz
mediapointer-dvb-s2-5a728a822e3d6d1fc62e86410ec71cb87504f08b.tar.bz2
merge with main repository
From: Hartmut Hackmann <hartmut.hackmann@t-online.de> Signed-off-by: Hartmut Hackmann <hartmut.hackmann@t-online.de>
Diffstat (limited to 'linux/drivers/media/dvb/cinergyT2')
-rw-r--r--linux/drivers/media/dvb/cinergyT2/cinergyT2.c9
1 files changed, 9 insertions, 0 deletions
diff --git a/linux/drivers/media/dvb/cinergyT2/cinergyT2.c b/linux/drivers/media/dvb/cinergyT2/cinergyT2.c
index 9c0eff865..4b092d7c2 100644
--- a/linux/drivers/media/dvb/cinergyT2/cinergyT2.c
+++ b/linux/drivers/media/dvb/cinergyT2/cinergyT2.c
@@ -864,6 +864,15 @@ static int cinergyt2_register_rc(struct cinergyt2 *cinergyt2)
set_bit(rc_keys[i + 2], input_dev->keybit);
input_dev->keycodesize = 0;
input_dev->keycodemax = 0;
+ input_dev->id.bustype = BUS_USB;
+ input_dev->id.vendor = cinergyt2->udev->descriptor.idVendor;
+ input_dev->id.product = cinergyt2->udev->descriptor.idProduct;
+ input_dev->id.version = 1;
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,15)
+ input_dev->cdev.dev = &cinergyt2->udev->dev;
+#else
+ input_dev->dev = &cinergyt2->udev->dev;
+#endif
err = input_register_device(input_dev);
if (err) {