diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-09-21 00:55:39 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-09-21 00:55:39 +0200 |
| commit | a57c21c7159e07c27e317ea3513dfb382be3f153 (patch) | |
| tree | d70427d2d2f44b9d973aa21e7eef93f30f17515d /drivers/usb/class | |
| parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6 (diff) | |
| parent | Driver-Core: extend devnode callbacks to provide permissions (diff) | |
| download | linux-a57c21c7159e07c27e317ea3513dfb382be3f153.tar.xz linux-a57c21c7159e07c27e317ea3513dfb382be3f153.zip | |
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/class')
| -rw-r--r-- | drivers/usb/class/usblp.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/usb/class/usblp.c b/drivers/usb/class/usblp.c index 26c09f0257db..9bc112ee7803 100644 --- a/drivers/usb/class/usblp.c +++ b/drivers/usb/class/usblp.c @@ -1057,14 +1057,14 @@ static const struct file_operations usblp_fops = { .release = usblp_release, }; -static char *usblp_nodename(struct device *dev) +static char *usblp_devnode(struct device *dev, mode_t *mode) { return kasprintf(GFP_KERNEL, "usb/%s", dev_name(dev)); } static struct usb_class_driver usblp_class = { .name = "lp%d", - .nodename = usblp_nodename, + .devnode = usblp_devnode, .fops = &usblp_fops, .minor_base = USBLP_MINOR_BASE, }; |