Merge tag 'media/v4.15-1' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/mcheh...

[linux-block.git] / drivers / media / usb / dvb-usb / dvb-usb-remote.c

diff --git a/drivers/media/usb/dvb-usb/dvb-usb-remote.c b/drivers/media/usb/dvb-usb/dvb-usb-remote.c
index 701c10835482c90f46e121af081f496ecdf53989..65e2c9e2cdc99f32b934fa3927074357af3cd2df 100644 (file)
--- a/drivers/media/usb/dvb-usb/dvb-usb-remote.c
+++ b/drivers/media/usb/dvb-usb/dvb-usb-remote.c
@@ -280,10 +280,11 @@ static int rc_core_dvb_usb_remote_init(struct dvb_usb_device *d)
        dev->change_protocol = d->props.rc.core.change_protocol;
        dev->allowed_protocols = d->props.rc.core.allowed_protos;
        usb_to_input_id(d->udev, &dev->input_id);
-       dev->device_name = "IR-receiver inside an USB DVB receiver";
+       dev->device_name = d->desc->name;
        dev->input_phys = d->rc_phys;
        dev->dev.parent = &d->udev->dev;
        dev->priv = d;
+       dev->scancode_mask = d->props.rc.core.scancode_mask;
 
        err = rc_register_device(dev);
        if (err < 0) {