Skip to contentSkip to conversation

mei: Fix debugfs filename in error output

PATCH Superseded Tomas Winkler 3 participants 6 messages Aug 24, 2015 – Sep 21, 2015

Subsystems (2)

v1 of 3 Superseded Latest is v3 →

lore
Share & tools
lore
#0 lore raw

PATCH 1/2 mei: Fix debugfs filename in error output

From: "Signed-off-by: Alexander Kuleshov" <[email protected]>

---
 drivers/misc/mei/debugfs.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/misc/mei/debugfs.c +1 -1
index 4b469cf9e60f..c157f0ba575c 100644
@@ -213,7 +213,7 @@ int mei_dbgfs_register(struct mei_device *dev, const char *name)
 	f = debugfs_create_file("active", S_IRUSR, dir,
 				dev, &mei_dbgfs_fops_active);
 	if (!f) {
-		dev_err(dev->dev, "meclients: registration failed\n");
+		dev_err(dev->dev, "active: registration failed\n");
 		goto err;
 	}
 	f = debugfs_create_file("devstate", S_IRUSR, dir,
Signature · 1 line
2.4.3
#1 lore raw

PATCH 2/2 mei: fix debugfs files leak on error path

if dbgfs_dir is not set then debugfs_remove_recursive is not called on the error path

---
 drivers/misc/mei/debugfs.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/misc/mei/debugfs.c +2 -1
index c157f0ba575c..a138d8a27ab5 100644
@@ -204,6 +204,8 @@ int mei_dbgfs_register(struct mei_device *dev, const char *name)
 	if (!dir)
 		return -ENOMEM;
 
+	dev->dbgfs_dir = dir;
+
 	f = debugfs_create_file("meclients", S_IRUSR, dir,
 				dev, &mei_dbgfs_fops_meclients);
 	if (!f) {
@@ -228,7 +230,6 @@ int mei_dbgfs_register(struct mei_device *dev, const char *name)
 		dev_err(dev->dev, "allow_fixed_address: registration failed\n");
 		goto err;
 	}
-	dev->dbgfs_dir = dir;
 	return 0;
 err:
 	mei_dbgfs_deregister(dev);
Signature · 1 line
2.4.3
#5 lore raw
Quoted 17 lines

-----Original Message-----
From: Greg Kroah-Hartman [mailto:[email protected]]
Sent: Monday, September 21, 2015 10:37
To: Alexander Kuleshov
Cc: Winkler, Tomas; Arnd Bergmann; Usyskin, Alexander; LKML
Subject: Re: [char-misc 1/2] mei: Fix debugfs filename in error output

Quoted 7 lines · Alexander Kuleshov

Hello Greg,

Quoted 3 lines · Greg Kroah-Hartman
Quoted 1 line · Tomas Winkler

From: "Signed-off-by: Alexander Kuleshov" <[email protected]>

Quoted 7 lines
Quoted 5 lines
Quoted 2 lines

I kind of doubt that's the real author name :(

Why? I've definitely sent this patch sometime ago
(https://lkml.org/lkml/2015/8/14/560)

Look at the line carefully.

I will resend w/o signed off
Tomas