From: Andrew Morton Cc: Greg KH Signed-off-by: Andrew Morton --- drivers/media/dvb/dvb-usb/dvb-usb-remote.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff -puN drivers/media/dvb/dvb-usb/dvb-usb-remote.c~dvb-usb-vs-driver-tree drivers/media/dvb/dvb-usb/dvb-usb-remote.c --- a/drivers/media/dvb/dvb-usb/dvb-usb-remote.c~dvb-usb-vs-driver-tree +++ a/drivers/media/dvb/dvb-usb/dvb-usb-remote.c @@ -109,7 +109,7 @@ int dvb_usb_remote_init(struct dvb_usb_d d->rc_input_dev->name = "IR-receiver inside an USB DVB receiver"; d->rc_input_dev->phys = d->rc_phys; usb_to_input_id(d->udev, &d->rc_input_dev->id); - d->rc_input_dev->cdev.dev = &d->udev->dev; + d->rc_input_dev->d.parent = &d->udev->dev; /* set the bits for the keys */ deb_rc("key map size: %d\n", d->props.rc_key_map_size); _