[char-misc 1/2] mei: Fix debugfs filename in error output

[char-misc 1/2] mei: Fix debugfs filename in error output

[Tomas Winkler]

From: "Signed-off-by: Alexander Kuleshov" <kuleshovmail@gmail.com>

Signed-off-by: Alexander Kuleshov <kuleshovmail@gmail.com>
Signed-off-by: Tomas Winkler <tomas.winkler@intel.com>
---
 drivers/misc/mei/debugfs.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/misc/mei/debugfs.c b/drivers/misc/mei/debugfs.c
index 4b469cf9e60f..c157f0ba575c 100644
--- a/drivers/misc/mei/debugfs.c
+++ b/drivers/misc/mei/debugfs.c
@@ -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,
-- 
2.4.3

[char-misc 2/2] mei: fix debugfs files leak on error path

[Tomas Winkler]

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

Signed-off-by: Tomas Winkler <tomas.winkler@intel.com>
---
 drivers/misc/mei/debugfs.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/drivers/misc/mei/debugfs.c b/drivers/misc/mei/debugfs.c
index c157f0ba575c..a138d8a27ab5 100644
--- a/drivers/misc/mei/debugfs.c
+++ b/drivers/misc/mei/debugfs.c
@@ -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);
-- 
2.4.3

Re: [char-misc 1/2] mei: Fix debugfs filename in error output

[Greg Kroah-Hartman]

On Mon, Aug 24, 2015 at 03:27:36PM +0300, Tomas Winkler wrote:
> From: "Signed-off-by: Alexander Kuleshov" <kuleshovmail@gmail.com>

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

Re: [char-misc 1/2] mei: Fix debugfs filename in error output

[Alexander Kuleshov]

Hello Greg,

On Mon, Sep 21, 2015 at 8:25 AM, Greg Kroah-Hartman
<gregkh@linuxfoundation.org> wrote:
> On Mon, Aug 24, 2015 at 03:27:36PM +0300, Tomas Winkler wrote:
>> From: "Signed-off-by: Alexander Kuleshov" <kuleshovmail@gmail.com>
>
> 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)

Thank you.

Re: [char-misc 1/2] mei: Fix debugfs filename in error output

[Greg Kroah-Hartman]

On Mon, Sep 21, 2015 at 01:07:21PM +0600, Alexander Kuleshov wrote:
> Hello Greg,
> 
> On Mon, Sep 21, 2015 at 8:25 AM, Greg Kroah-Hartman
> <gregkh@linuxfoundation.org> wrote:
> > On Mon, Aug 24, 2015 at 03:27:36PM +0300, Tomas Winkler wrote:
> >> From: "Signed-off-by: Alexander Kuleshov" <kuleshovmail@gmail.com>
> >
> > 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...

RE: [char-misc 1/2] mei: Fix debugfs filename in error output

[Winkler, Tomas]

> -----Original Message-----
> From: Greg Kroah-Hartman [mailto:gregkh@linuxfoundation.org]
> 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
> 
> On Mon, Sep 21, 2015 at 01:07:21PM +0600, Alexander Kuleshov wrote:
> > Hello Greg,
> >
> > On Mon, Sep 21, 2015 at 8:25 AM, Greg Kroah-Hartman
> > <gregkh@linuxfoundation.org> wrote:
> > > On Mon, Aug 24, 2015 at 03:27:36PM +0300, Tomas Winkler wrote:
> > >> From: "Signed-off-by: Alexander Kuleshov" <kuleshovmail@gmail.com>
> > >
> > > 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