summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorUnai Uribarri <unaiur@gmail.com>2006-08-27 23:01:24 -0300
committerMauro Carvalho Chehab <mchehab@infradead.org>2006-09-26 12:30:34 -0300
commit4fcd7d8f7b6ce0a0adb3edd6d6edcbf2fd05a02b (patch)
treea5aca4e4b71a90ad1120516c9c5d8016ba41c3e2
parent58f56cbe29042dca81fd59c05fb2055d58557d1e (diff)
downloadlinux-4fcd7d8f7b6ce0a0adb3edd6d6edcbf2fd05a02b.tar.gz
linux-4fcd7d8f7b6ce0a0adb3edd6d6edcbf2fd05a02b.tar.bz2
linux-4fcd7d8f7b6ce0a0adb3edd6d6edcbf2fd05a02b.zip
V4L/DVB (4561): Sync'ing dvb-usb-remote with changes in USB input subsystem
This patch fixes the physical address and takes into account recent changes in the USB input subsystem. Acked-by: Dmitry Torokhov <dtor@mail.ru> Signed-off-by: Unai Uribarri <unaiur@gmail.com> Signed-off-by: Trent Piepho <xyzzy@speakeasy.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
-rw-r--r--drivers/media/dvb/dvb-usb/dvb-usb-remote.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/media/dvb/dvb-usb/dvb-usb-remote.c b/drivers/media/dvb/dvb-usb/dvb-usb-remote.c
index e5c6d9835e06..380b2a45ee4c 100644
--- a/drivers/media/dvb/dvb-usb/dvb-usb-remote.c
+++ b/drivers/media/dvb/dvb-usb/dvb-usb-remote.c
@@ -6,6 +6,7 @@
* This file contains functions for initializing the the input-device and for handling remote-control-queries.
*/
#include "dvb-usb-common.h"
+#include <linux/usb/input.h>
/* Remote-control poll function - called every dib->rc_query_interval ms to see
* whether the remote control has received anything.
@@ -96,7 +97,7 @@ int dvb_usb_remote_init(struct dvb_usb_device *d)
return 0;
usb_make_path(d->udev, d->rc_phys, sizeof(d->rc_phys));
- strlcpy(d->rc_phys, "/ir0", sizeof(d->rc_phys));
+ strlcat(d->rc_phys, "/ir0", sizeof(d->rc_phys));
d->rc_input_dev = input_allocate_device();
if (!d->rc_input_dev)
@@ -107,6 +108,8 @@ int dvb_usb_remote_init(struct dvb_usb_device *d)
d->rc_input_dev->keycodemax = KEY_MAX;
d->rc_input_dev->name = "IR-receiver inside an USB DVB receiver";
d->rc_input_dev->phys = d->rc_phys;
+ usb_to_input_id(d->udev, &d->rc_input_dev->id);
+ d->rc_input_dev->cdev.dev = &d->udev->dev;
/* set the bits for the keys */
deb_rc("key map size: %d\n", d->props.rc_key_map_size);