[PATCH] UBI: fix return error code

Richard Weinberger richard at nod.at
Wed Dec 9 04:07:39 PST 2015


Am 09.12.2015 um 13:02 schrieb Sudip Mukherjee:
> On Fri, Nov 20, 2015 at 11:17:55AM +0100, Richard Weinberger wrote:
>> Am 20.11.2015 um 11:14 schrieb Sudip Mukherjee:
>>> We are checking dfs_rootdir for error value or NULL. But in the
>>> conditional ternary operator we returned -ENODEV if dfs_rootdir contains
>>> an error value and returned PTR_ERR(dfs_rootdir) if dfs_rootdir is NULL.
>>> So in the case of dfs_rootdir being NULL we actually assigned 0 to err
>>> and returned it to the caller implying a success.
>>> Lets return -ENODEV when dfs_rootdir is NULL else return
>>> PTR_ERR(dfs_rootdir).
>>>
>>> Signed-off-by: Sudip Mukherjee <sudip at vectorindia.org>
>>> ---
>>>  drivers/mtd/ubi/debug.c | 2 +-
>>>  1 file changed, 1 insertion(+), 1 deletion(-)
>>>
>>> diff --git a/drivers/mtd/ubi/debug.c b/drivers/mtd/ubi/debug.c
>>> index b077e43..c4cb15a 100644
>>> --- a/drivers/mtd/ubi/debug.c
>>> +++ b/drivers/mtd/ubi/debug.c
>>> @@ -236,7 +236,7 @@ int ubi_debugfs_init(void)
>>>  
>>>  	dfs_rootdir = debugfs_create_dir("ubi", NULL);
>>>  	if (IS_ERR_OR_NULL(dfs_rootdir)) {
>>> -		int err = dfs_rootdir ? -ENODEV : PTR_ERR(dfs_rootdir);
>>> +		int err = dfs_rootdir ? PTR_ERR(dfs_rootdir) : -ENODEV;
>>>  
>>
>> Nice catch!
> 
> Hi Richard,
> It is still not on linus-next. Did you miss it?

I did not miss it, currently I'm traveling a lot and the
days before xmas are always super crazy here.
That's why I'm horrible backlogged.

Thanks,
//richard



More information about the linux-mtd mailing list