1 May 2008 02:59
Fix ACPI vs proc_create_data() mismerge
Linux Kernel Mailing List <linux-kernel <at> vger.kernel.org>
2008-05-01 00:59:02 GMT
2008-05-01 00:59:02 GMT
Gitweb: http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=e0066c4ea9ffa420cb79814411ff74fdc7b7d98e Commit: e0066c4ea9ffa420cb79814411ff74fdc7b7d98e Parent: 08acd4f8af42affd8cbed81cc1b69fa12ddb213f Author: Alexey Dobriyan <adobriyan <at> gmail.com> AuthorDate: Thu May 1 04:10:02 2008 +0400 Committer: Linus Torvalds <torvalds <at> linux-foundation.org> CommitDate: Wed Apr 30 16:26:27 2008 -0700 Fix ACPI vs proc_create_data() mismerge acpi_device_dir() is NULL until all files are createst, so everyting is created in straight in /proc/ and creation code warns. Signed-off-by: Alexey Dobriyan <adobriyan <at> gmail.com> Signed-off-by: Linus Torvalds <torvalds <at> linux-foundation.org> --- drivers/acpi/video.c | 20 +++++++++++--------- 1 files changed, 11 insertions(+), 9 deletions(-) diff --git a/drivers/acpi/video.c b/drivers/acpi/video.c index f7eb12e..5e5dda3 100644 --- a/drivers/acpi/video.c +++ b/drivers/acpi/video.c <at> <at> -1070,7 +1070,7 <at> <at> static int acpi_video_device_add_fs(struct acpi_device *device) device_dir->owner = THIS_MODULE; /* 'info' [R] */ - entry = proc_create_data("info", S_IRUGO, acpi_device_dir(device), + entry = proc_create_data("info", S_IRUGO, device_dir, &acpi_video_device_info_fops, acpi_driver_data(device));(Continue reading)
RSS Feed