Return-path: Received: from lists.s-osg.org ([54.187.51.154]:49312 "EHLO lists.s-osg.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751667AbcFVMj3 (ORCPT ); Wed, 22 Jun 2016 08:39:29 -0400 From: Luis de Bethencourt To: linux-kernel@vger.kernel.org Cc: johnny.kim@atmel.com, austin.shin@atmel.com, chris.park@atmel.com, tony.cho@atmel.com, glen.lee@atmel.com, leo.kim@atmel.com, gregkh@linuxfoundation.org, linux-wireless@vger.kernel.org, devel@driverdev.osuosl.org, Luis de Bethencourt Subject: [PATCH] staging: wilc1000: fix error handling in wilc_debugfs_init() Date: Wed, 22 Jun 2016 13:39:14 +0100 Message-Id: <1466599154-4782-1-git-send-email-luisbg@osg.samsung.com> (sfid-20160622_143947_246604_7D0D5A08) Sender: linux-wireless-owner@vger.kernel.org List-ID: The common format to check if a function returned an error pointer is to use PTR_ERR(). Instead of ERR_PTR() which is used to return said errors. Also, if there was an error returning -EINVAL instead of -1 is more appropriate. Signed-off-by: Luis de Bethencourt --- drivers/staging/wilc1000/wilc_debugfs.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/staging/wilc1000/wilc_debugfs.c b/drivers/staging/wilc1000/wilc_debugfs.c index fcbc95d..6252931 100644 --- a/drivers/staging/wilc1000/wilc_debugfs.c +++ b/drivers/staging/wilc1000/wilc_debugfs.c @@ -107,7 +107,7 @@ static int __init wilc_debugfs_init(void) struct wilc_debugfs_info_t *info; wilc_dir = debugfs_create_dir("wilc_wifi", NULL); - if (wilc_dir == ERR_PTR(-ENODEV)) { + if (PTR_ERR(wilc_dir) == -ENODEV) { /* it's not error. the debugfs is just not being enabled. */ printk("ERR, kernel has built without debugfs support\n"); return 0; @@ -115,7 +115,7 @@ static int __init wilc_debugfs_init(void) if (!wilc_dir) { printk("ERR, debugfs create dir\n"); - return -1; + return -EINVAL; } for (i = 0; i < ARRAY_SIZE(debugfs_info); i++) { @@ -129,7 +129,7 @@ static int __init wilc_debugfs_init(void) if (!debugfs_files) { printk("ERR fail to create the debugfs file, %s\n", info->name); debugfs_remove_recursive(wilc_dir); - return -1; + return -EINVAL; } } return 0; -- 2.5.1