Re: linux-next: build failure after merge of the drivers-x86 tree
From: Mattia Dongili <malattia@linux.it>
Date: 2011-02-22 11:46:04
Also in:
lkml, platform-driver-x86
Subsystem:
sony vaio control device driver, the rest, x86 platform drivers · Maintainers:
Mattia Dongili, Linus Torvalds, Hans de Goede, Ilpo Järvinen
On Tue, Feb 22, 2011 at 03:26:53PM +0900, Mattia Dongili wrote:
Stephen Rothwell [off-list ref] wrote:quoted
Hi Matthew, After merging the drivers-x86 tree, today's linux-next build (x86_64 allmodconfig) failed like this:Apologies, I didn't test my code with DEBUG_LOCK_ALLOC=y. I'll send a fix in as soon as I get around a usable network connection.
the below patch fixes the build failure. how does linux-next work? should this patch be a separate commit or can it be folded into the offending one?
diff --git a/drivers/platform/x86/sony-laptop.c b/drivers/platform/x86/sony-laptop.c
index a097a27..a0ba0e7 100644
--- a/drivers/platform/x86/sony-laptop.c
+++ b/drivers/platform/x86/sony-laptop.c@@ -769,7 +769,7 @@ static int sony_nc_handles_setup(struct platform_device *pd) handles = kzalloc(sizeof(*handles), GFP_KERNEL); - sysfs_attr_init(handles->devattr); + sysfs_attr_init(&handles->devattr.attr); handles->devattr.attr.name = "handles"; handles->devattr.attr.mode = S_IRUGO; handles->devattr.show = sony_nc_handles_show;
@@ -1459,13 +1459,13 @@ static int sony_nc_kbd_backlight_setup(struct platform_device *pd) kbdbl_handle = kzalloc(sizeof(*kbdbl_handle), GFP_KERNEL); - sysfs_attr_init(kbdbl_handle->mode_attr); + sysfs_attr_init(&kbdbl_handle->mode_attr.attr); kbdbl_handle->mode_attr.attr.name = "kbd_backlight"; kbdbl_handle->mode_attr.attr.mode = S_IRUGO | S_IWUSR; kbdbl_handle->mode_attr.show = sony_nc_kbd_backlight_mode_show; kbdbl_handle->mode_attr.store = sony_nc_kbd_backlight_mode_store; - sysfs_attr_init(kbdbl_handle->timeout_attr); + sysfs_attr_init(&kbdbl_handle->timeout_attr.attr); kbdbl_handle->timeout_attr.attr.name = "kbd_backlight_timeout"; kbdbl_handle->timeout_attr.attr.mode = S_IRUGO | S_IWUSR; kbdbl_handle->timeout_attr.show = sony_nc_kbd_backlight_timeout_show;
--
mattia
:wq!