From 8f5f3cd42a9a36a7a6afaad1eb7094e041923185 Mon Sep 17 00:00:00 2001 From: Paul Bender Date: Thu, 16 Dec 2010 13:23:07 -0300 Subject: [PATCH] --- yaml --- r: 223568 b: refs/heads/master c: 635f76b2aa8ef3e8436dedddc8baa6f7f438dc40 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/media/IR/mceusb.c | 7 +++++-- trunk/drivers/media/IR/streamzap.c | 6 +++++- 3 files changed, 11 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 5c848e899ab0..6a462f431eb4 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 1338c925a95cf2b95909d7967b4ebddefa255c02 +refs/heads/master: 635f76b2aa8ef3e8436dedddc8baa6f7f438dc40 diff --git a/trunk/drivers/media/IR/mceusb.c b/trunk/drivers/media/IR/mceusb.c index ba224593b947..57ef80950b90 100644 --- a/trunk/drivers/media/IR/mceusb.c +++ b/trunk/drivers/media/IR/mceusb.c @@ -35,10 +35,10 @@ #include #include #include -#include #include +#include +#include #include -#include #define DRIVER_VERSION "1.91" #define DRIVER_AUTHOR "Jarod Wilson " @@ -1079,6 +1079,9 @@ static struct input_dev *mceusb_init_input_dev(struct mceusb_dev *ir) ir->props = props; + usb_to_input_id(ir->usbdev, &idev->id); + idev->dev.parent = ir->dev; + if (mceusb_model[ir->model].rc_map) rc_map = mceusb_model[ir->model].rc_map; diff --git a/trunk/drivers/media/IR/streamzap.c b/trunk/drivers/media/IR/streamzap.c index c6157ee73ffa..3a20aef67d08 100644 --- a/trunk/drivers/media/IR/streamzap.c +++ b/trunk/drivers/media/IR/streamzap.c @@ -34,8 +34,9 @@ #include #include #include -#include #include +#include +#include #include #define DRIVER_VERSION "1.61" @@ -332,6 +333,9 @@ static struct input_dev *streamzap_init_input_dev(struct streamzap_ir *sz) sz->props = props; + usb_to_input_id(sz->usbdev, &idev->id); + idev->dev.parent = sz->dev; + ret = ir_input_register(idev, RC_MAP_STREAMZAP, props, DRIVER_NAME); if (ret < 0) { dev_err(dev, "remote input device register failed\n");