linux-kernel - [PATCH 1/3] HID: fixed typos from last commits regarding sysfs bin attr groups

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [day] [month] [year] [list]

Date:	Mon, 15 Nov 2010 21:32:45 +0100
From:	Stefan Achatz <erazor_de@...rs.sourceforge.net>
To:	Jiri Kosina <jkosina@...e.cz>, Greg Kroah-Hartman <gregkh@...e.de>,
	linux-input@...r.kernel.org, linux-kernel@...r.kernel.org
Subject: [PATCH 1/3] HID: fixed typos from last commits regarding sysfs bin
 attr groups

Added a 'static' where it belongs and changed a function call to use
the right one.

Signed-off-by: Stefan Achatz <erazor_de@...rs.sourceforge.net>
---
 drivers/hid/hid-roccat-kone.c |    2 +-
 fs/sysfs/group.c              |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/hid/hid-roccat-kone.c b/drivers/hid/hid-roccat-kone.c
index ccb5724..799dc80 100644
--- a/drivers/hid/hid-roccat-kone.c
+++ b/drivers/hid/hid-roccat-kone.c
@@ -695,7 +695,7 @@ exit_1:
 
 static void kone_remove_sysfs_attributes(struct usb_interface *intf)
 {
-	sysfs_remove_group(&intf->dev.kobj, &kone_bin_attribute_group);
+	sysfs_remove_bin_group(&intf->dev.kobj, &kone_bin_attribute_group);
 	sysfs_remove_group(&intf->dev.kobj, &kone_attribute_group);
 }
 
diff --git a/fs/sysfs/group.c b/fs/sysfs/group.c
index 841baed..7e60e9c 100644
--- a/fs/sysfs/group.c
+++ b/fs/sysfs/group.c
@@ -167,7 +167,7 @@ void sysfs_remove_bin_group(struct kobject * kobj,
 }
 EXPORT_SYMBOL_GPL(sysfs_remove_bin_group);
 
-int internal_merge_group(struct kobject *kobj,
+static int internal_merge_group(struct kobject *kobj,
 		       const struct attribute_group *grp, int type)
 {
 	struct sysfs_dirent *dir_sd;
-- 
1.7.2.3



--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/