Thread (3 messages) flat view 3 messages, 2 authors, 2015-08-20

Re: [PATCH v2] drivers/hid: Check result of debugfs_create_dir() and debugfs_create_file()

From: Jiri Kosina <jikos@kernel.org>
Date: 2015-08-19 20:41:57
Also in: lkml

On Wed, 19 Aug 2015, Alexander Kuleshov wrote:
quoted hunk ↗ jump to hunk
The debugfs_create_dir() and debugfs_create_file() functions may return -errno
if an error occurs. This patch adds a couple of checks of the result of the
debufs_create_dir() and debugfs_create_file() functions execution in the
hid_debug_register() and othre places.

Changelog:

v2:

  * add check for the result of the debugfs_create_file() calls
  * call hid_debug_init() and hid_debug_exit() only if hid_debug
  * add check for the hid_debug_root in the hid_debug_register()

Signed-off-by: Alexander Kuleshov <redacted>
---
 drivers/hid/hid-core.c  | 15 ++++++++++-----
 drivers/hid/hid-debug.c | 38 ++++++++++++++++++++++++++++++++++----
 2 files changed, 44 insertions(+), 9 deletions(-)
diff --git a/drivers/hid/hid-core.c b/drivers/hid/hid-core.c
index e6fce23..8aa2c20 100644
--- a/drivers/hid/hid-core.c
+++ b/drivers/hid/hid-core.c
@@ -2599,8 +2599,10 @@ int hid_add_device(struct hid_device *hdev)
 	ret = device_add(&hdev->dev);
 	if (!ret)
 		hdev->status |= HID_STAT_ADDED;
-	else
-		hid_debug_unregister(hdev);
+	else {
+		if (hdev->debug)
+			hid_debug_unregister(hdev);
+	}
 
 	return ret;
 }
@@ -2644,7 +2646,8 @@ static void hid_remove_device(struct hid_device *hdev)
 {
 	if (hdev->status & HID_STAT_ADDED) {
 		device_del(&hdev->dev);
-		hid_debug_unregister(hdev);
+		if (hdev->debug)
+			hid_debug_unregister(hdev);
 		hdev->status &= ~HID_STAT_ADDED;
 	}
 	kfree(hdev->dev_rdesc);
@@ -2737,7 +2740,8 @@ static int __init hid_init(void)
 	if (ret)
 		goto err_bus;
 
-	hid_debug_init();
+	if (hid_debug)
+		hid_debug_init();
How is this change related to the rest of the patch?

It's wrong anyway, because hid_debug is independent of the debugfs HID 
debugging facility. Please see for example the printk() a few lines above 
in this very function, which is emited in case hid_debug is enabled.

-- 
Jiri Kosina
SUSE Labs
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help