[media] rc: fix sysfs entry for mceusb and streamzap

When trying to create persistent device names for mceusb and streamzap
devices, I noticed that their respective drivers are not creating the rc
device as a child of the USB device. Rather it creates it as virtual
device. As a result, udev cannot use the USB device information to
create persistent device names for event and lirc devices associated
with the rc device. Not having persistent device names makes it more

difficult to make use of the devices in userspace as their names can
change.

Forward-ported to media_tree staging/for_v2.6.38 and tested with
both streamzap and mceusb devices:
$ ll /dev/input/by-id/
...
lrwxrwxrwx. 1 root root 9 Nov 17 17:06 usb-Streamzap__Inc._Streamzap_Remote_Control-event-if00 -> ../event6
lrwxrwxrwx. 1 root root 9 Nov 17 17:05 usb-Topseed_Technology_Corp._eHome_Infrared_Transceiver_TS000BzY-event-if00 -> ../event5
Previously, nada.

Signed-off-by: Paul Bender <pebender@gmail.com>
Tested-by: Jarod Wilson <jarod@redhat.com>
Signed-off-by: Jarod Wilson <jarod@redhat.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>

diff --git a/drivers/media/rc/mceusb.c b/drivers/media/rc/mceusb.c
index c2cb58a0c6edf9393f7c6cf336288d796f4826fa..0fef6efad537adb14000ac426d942f1d7871ecf2 100644 (file)
--- a/drivers/media/rc/mceusb.c
+++ b/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/drivers/media/rc/streamzap.c b/drivers/media/rc/streamzap.c
index 7814ec709bfc1656f3a51918562019819d489827..7f82f55159da903bf35036d45d1bb235143234e3 100644 (file)
--- a/drivers/media/rc/streamzap.c
+++ b/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;