diff options
Diffstat (limited to 'drivers/media')
-rw-r--r-- | drivers/media/dvb/dvb-core/dvbdev.c | 4 | ||||
-rw-r--r-- | drivers/media/video/dabusb.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/drivers/media/dvb/dvb-core/dvbdev.c b/drivers/media/dvb/dvb-core/dvbdev.c index 479dd05762a5..94159b90f733 100644 --- a/drivers/media/dvb/dvb-core/dvbdev.c +++ b/drivers/media/dvb/dvb-core/dvbdev.c | |||
@@ -447,7 +447,7 @@ static int dvb_uevent(struct device *dev, struct kobj_uevent_env *env) | |||
447 | return 0; | 447 | return 0; |
448 | } | 448 | } |
449 | 449 | ||
450 | static char *dvb_nodename(struct device *dev) | 450 | static char *dvb_devnode(struct device *dev, mode_t *mode) |
451 | { | 451 | { |
452 | struct dvb_device *dvbdev = dev_get_drvdata(dev); | 452 | struct dvb_device *dvbdev = dev_get_drvdata(dev); |
453 | 453 | ||
@@ -478,7 +478,7 @@ static int __init init_dvbdev(void) | |||
478 | goto error; | 478 | goto error; |
479 | } | 479 | } |
480 | dvb_class->dev_uevent = dvb_uevent; | 480 | dvb_class->dev_uevent = dvb_uevent; |
481 | dvb_class->nodename = dvb_nodename; | 481 | dvb_class->devnode = dvb_devnode; |
482 | return 0; | 482 | return 0; |
483 | 483 | ||
484 | error: | 484 | error: |
diff --git a/drivers/media/video/dabusb.c b/drivers/media/video/dabusb.c index 0664d111085f..ee43876adb06 100644 --- a/drivers/media/video/dabusb.c +++ b/drivers/media/video/dabusb.c | |||
@@ -748,14 +748,14 @@ static const struct file_operations dabusb_fops = | |||
748 | .release = dabusb_release, | 748 | .release = dabusb_release, |
749 | }; | 749 | }; |
750 | 750 | ||
751 | static char *dabusb_nodename(struct device *dev) | 751 | static char *dabusb_devnode(struct device *dev, mode_t *mode) |
752 | { | 752 | { |
753 | return kasprintf(GFP_KERNEL, "usb/%s", dev_name(dev)); | 753 | return kasprintf(GFP_KERNEL, "usb/%s", dev_name(dev)); |
754 | } | 754 | } |
755 | 755 | ||
756 | static struct usb_class_driver dabusb_class = { | 756 | static struct usb_class_driver dabusb_class = { |
757 | .name = "dabusb%d", | 757 | .name = "dabusb%d", |
758 | .nodename = dabusb_nodename, | 758 | .devnode = dabusb_devnode, |
759 | .fops = &dabusb_fops, | 759 | .fops = &dabusb_fops, |
760 | .minor_base = DABUSB_MINOR, | 760 | .minor_base = DABUSB_MINOR, |
761 | }; | 761 | }; |