Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 635f76b2 authored by Paul Bender's avatar Paul Bender Committed by Mauro Carvalho Chehab
Browse files

[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.

Signed-off-by: default avatarPaul Bender <pebender@gmail.com>
Signed-off-by: default avatarJarod Wilson <jarod@redhat.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent 1338c925

drivers/media/IR/mceusb.c

+5 −2
Original line number Original line Diff line number Diff line
@@ -35,10 +35,10 @@ 
#include <linux/device.h>

#include <linux/device.h>

#include <linux/module.h>

#include <linux/module.h>

#include <linux/slab.h>

#include <linux/slab.h>

#include <linux/usb.h>

#include <linux/input.h>

#include <linux/input.h>

#include <linux/usb.h>

#include <linux/usb/input.h>

#include <media/ir-core.h>

#include <media/ir-core.h>

#include <media/ir-common.h>





#define DRIVER_VERSION	"1.91"

#define DRIVER_VERSION	"1.91"

#define DRIVER_AUTHOR	"Jarod Wilson <jarod@wilsonet.com>"

#define DRIVER_AUTHOR	"Jarod Wilson <jarod@wilsonet.com>"
@@ -1079,6 +1079,9 @@ static struct input_dev *mceusb_init_input_dev(struct mceusb_dev *ir) 




	ir->props = props;

	ir->props = props;





	usb_to_input_id(ir->usbdev, &idev->id);

	idev->dev.parent = ir->dev;



	if (mceusb_model[ir->model].rc_map)

	if (mceusb_model[ir->model].rc_map)

		rc_map = mceusb_model[ir->model].rc_map;

		rc_map = mceusb_model[ir->model].rc_map;

drivers/media/IR/streamzap.c

+5 −1
Original line number Original line Diff line number Diff line
@@ -34,8 +34,9 @@ 
#include <linux/device.h>

#include <linux/device.h>

#include <linux/module.h>

#include <linux/module.h>

#include <linux/slab.h>

#include <linux/slab.h>

#include <linux/usb.h>

#include <linux/input.h>

#include <linux/input.h>

#include <linux/usb.h>

#include <linux/usb/input.h>

#include <media/ir-core.h>

#include <media/ir-core.h>





#define DRIVER_VERSION	"1.61"

#define DRIVER_VERSION	"1.61"
@@ -332,6 +333,9 @@ static struct input_dev *streamzap_init_input_dev(struct streamzap_ir *sz) 




	sz->props = props;

	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);

	ret = ir_input_register(idev, RC_MAP_STREAMZAP, props, DRIVER_NAME);

	if (ret < 0) {

	if (ret < 0) {

		dev_err(dev, "remote input device register failed\n");

		dev_err(dev, "remote input device register failed\n");