GitHub-Mirror/Star64_linux
2
0
Fork 0
mirror of https://github.com/Fishwaldo/Star64_linux.git synced 2025-06-21 14:11:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Driver-Core: fix devnode callbacks for dabusb and industrialio

Browse source 
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>
This commit is contained in:
Ingo Molnar 2009-09-21 08:56:58 +02:00 • committed by Linus Torvalds
parent ebc79c4f8d
commit 388dba3047
2 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

4
drivers/media/video/dabusb.c
View file

@ -748,14 +748,14 @@ static const struct file_operations dabusb_fops =
.release = dabusb_release, .release = dabusb_release,
}; };
static char *dabusb_nodename(struct device *dev) static char *dabusb_devnode(struct device *dev, mode_t *mode)
{ {
return kasprintf(GFP_KERNEL, "usb/%s", dev_name(dev)); return kasprintf(GFP_KERNEL, "usb/%s", dev_name(dev));
} }
static struct usb_class_driver dabusb_class = { static struct usb_class_driver dabusb_class = {
.name = "dabusb%d", .name = "dabusb%d",
.nodename = dabusb_nodename, .devnode = dabusb_devnode,
.fops = &dabusb_fops, .fops = &dabusb_fops,
.minor_base = DABUSB_MINOR, .minor_base = DABUSB_MINOR,
}; };

4
drivers/staging/iio/industrialio-core.c
View file

@ -39,14 +39,14 @@ dev_t iio_devt;
EXPORT_SYMBOL(iio_devt); EXPORT_SYMBOL(iio_devt);
#define IIO_DEV_MAX 256 #define IIO_DEV_MAX 256
static char *iio_nodename(struct device *dev) static char *iio_devnode(struct device *dev, mode_t *mode)
{ {
return kasprintf(GFP_KERNEL, "iio/%s", dev_name(dev)); return kasprintf(GFP_KERNEL, "iio/%s", dev_name(dev));
} }
struct class iio_class = { struct class iio_class = {
.name = "iio", .name = "iio",
.nodename = iio_nodename, .devnode = iio_devnode,
}; };
EXPORT_SYMBOL(iio_class); EXPORT_SYMBOL(iio_class);