From e9ef2ad15c1df1e780584fbdfabd924f98972594 Mon Sep 17 00:00:00 2001 From: Paul Bender Date: Wed, 17 Nov 2010 16:56:17 -0300 Subject: [PATCH] --- yaml --- r: 226293 b: refs/heads/master c: 5ad1a55542dd69d2c6aa7db5ca79073d693bbfed h: refs/heads/master i: 226291: 7e29d48adeb67ab518e1703c5bed6b929dee9ba3 v: v3 --- [refs] | 2 +- trunk/drivers/media/rc/mceusb.c | 2 +- trunk/drivers/media/rc/streamzap.c | 2 ++ 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 59ed937e8db5..194837cbfb01 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 5df465df7bd9c352289ca63d4d9f78299be72c7d +refs/heads/master: 5ad1a55542dd69d2c6aa7db5ca79073d693bbfed diff --git a/trunk/drivers/media/rc/mceusb.c b/trunk/drivers/media/rc/mceusb.c index c2cb58a0c6ed..0fef6efad537 100644 --- a/trunk/drivers/media/rc/mceusb.c +++ b/trunk/drivers/media/rc/mceusb.c @@ -1047,7 +1047,7 @@ static struct rc_dev *mceusb_init_rc_dev(struct mceusb_dev *ir) snprintf(ir->name, sizeof(ir->name), "%s (%04x:%04x)", mceusb_model[ir->model].name ? - mceusb_model[ir->model].name : + mceusb_model[ir->model].name : "Media Center Ed. eHome Infrared Remote Transceiver", le16_to_cpu(ir->usbdev->descriptor.idVendor), le16_to_cpu(ir->usbdev->descriptor.idProduct)); diff --git a/trunk/drivers/media/rc/streamzap.c b/trunk/drivers/media/rc/streamzap.c index 7814ec709bfc..7f82f55159da 100644 --- a/trunk/drivers/media/rc/streamzap.c +++ b/trunk/drivers/media/rc/streamzap.c @@ -316,6 +316,8 @@ static struct rc_dev *streamzap_init_rc_dev(struct streamzap_ir *sz) rdev->input_name = sz->name; rdev->input_phys = sz->phys; + usb_to_input_id(sz->usbdev, &rdev->input_id); + rdev->dev.parent = dev; rdev->priv = sz; rdev->driver_type = RC_DRIVER_IR_RAW; rdev->allowed_protos = RC_TYPE_ALL;