diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-09-21 02:55:39 +0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-09-21 02:55:39 +0400 |
| commit | a57c21c7159e07c27e317ea3513dfb382be3f153 (patch) | |
| tree | d70427d2d2f44b9d973aa21e7eef93f30f17515d /drivers/usb/core/file.c | |
| parent | e11c675ede0d42a405ae595528bf0b29ce1ae56f (diff) | |
| parent | e454cea20bdcff10ee698d11b8882662a0153a47 (diff) | |
| download | linux-a57c21c7159e07c27e317ea3513dfb382be3f153.tar.xz | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core-2.6:
Driver-Core: extend devnode callbacks to provide permissions
Diffstat (limited to 'drivers/usb/core/file.c')
| -rw-r--r-- | drivers/usb/core/file.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/usb/core/file.c b/drivers/usb/core/file.c index 5cef88929b3e..222ee07ea680 100644 --- a/drivers/usb/core/file.c +++ b/drivers/usb/core/file.c @@ -67,14 +67,14 @@ static struct usb_class { struct class *class; } *usb_class; -static char *usb_nodename(struct device *dev) +static char *usb_devnode(struct device *dev, mode_t *mode) { struct usb_class_driver *drv; drv = dev_get_drvdata(dev); - if (!drv || !drv->nodename) + if (!drv || !drv->devnode) return NULL; - return drv->nodename(dev); + return drv->devnode(dev, mode); } static int init_usb_class(void) @@ -100,7 +100,7 @@ static int init_usb_class(void) kfree(usb_class); usb_class = NULL; } - usb_class->class->nodename = usb_nodename; + usb_class->class->devnode = usb_devnode; exit: return result; |