aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/video/dabusb.c
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2009-09-21 02:56:58 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2009-09-21 10:36:33 -0400
commit388dba30471c236a290c4082bce5f2b5cd1a7a06 (patch)
tree3c71d6cea401158ed2da5bfc40ee22db9eb00e63 /drivers/media/video/dabusb.c
parentebc79c4f8da0f92efa968e0328f32334a2ce80cf (diff)
Driver-Core: fix devnode callbacks for dabusb and industrialio
The build of the dabusb driver broke: drivers/media/video/dabusb.c:758: error: unknown field 'nodename' specified in initializer drivers/media/video/dabusb.c:758: warning: initialization from incompatible pointer type make[3]: *** wait: No child processes. Stop. Due to this commit: e454cea: Driver-Core: extend devnode callbacks to provide permissions Missing the dabusb driver's dabusb_nodename() callback. Similar issues with the iio/industrialio driver in staging, pointed out and patched by Jean Delvare. Signed-off-by: Ingo Molnar <mingo@elte.hu> Industrialio-parts-by: Jean Delvare <khali@linux-fr.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers/media/video/dabusb.c')
-rw-r--r--drivers/media/video/dabusb.c4
1 files changed, 2 insertions, 2 deletions
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
751static char *dabusb_nodename(struct device *dev) 751static 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
756static struct usb_class_driver dabusb_class = { 756static 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};