[PATCH] staging: wilc1000: fix static checker warning to unlock mutex in wilc_deinit()

[PATCH] staging: wilc1000: fix static checker warning to unlock mutex in wilc_deinit()

[Ajay Singh]

Fix for static checker warning inconsistent returns of
'hif_deinit_lock'(more details [1]).

"drivers/staging/wilc1000/host_interface.c:3390 wilc_deinit()
              warn: inconsistent returns 'hif_deinit_lock'."

Introduced in "ff52a57a7a42: staging: wilc1000: move the allocation of
cmd out of wilc_enqueue_cmd()".

[1]. https://www.spinics.net/lists/linux-driver-devel/msg114216.html

Reported-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Ajay Singh <ajay.kathat@microchip.com>
---
 drivers/staging/wilc1000/host_interface.c | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/drivers/staging/wilc1000/host_interface.c b/drivers/staging/wilc1000/host_interface.c
index 52c0c10..918d06e 100644
--- a/drivers/staging/wilc1000/host_interface.c
+++ b/drivers/staging/wilc1000/host_interface.c
@@ -3370,15 +3370,15 @@ int wilc_deinit(struct wilc_vif *vif)
 		struct host_if_msg *msg;
 
 		msg = wilc_alloc_work(vif, handle_hif_exit_work, true);
-		if (IS_ERR(msg))
-			return PTR_ERR(msg);
-
-		result = wilc_enqueue_work(msg);
-		if (result)
-			netdev_err(vif->ndev, "deinit : Error(%d)\n", result);
-		else
-			wait_for_completion(&msg->work_comp);
-		kfree(msg);
+		if (!IS_ERR(msg)) {
+			result = wilc_enqueue_work(msg);
+			if (result)
+				netdev_err(vif->ndev, "deinit : Error(%d)\n",
+					   result);
+			else
+				wait_for_completion(&msg->work_comp);
+			kfree(msg);
+		}
 		destroy_workqueue(hif_workqueue);
 	}
 
-- 
2.7.4

Re: [PATCH] staging: wilc1000: fix static checker warning to unlock mutex in wilc_deinit()

[Dan Carpenter]

On Thu, Jul 05, 2018 at 09:18:53AM +0530, Ajay Singh wrote:
> Fix for static checker warning inconsistent returns of
> 'hif_deinit_lock'(more details [1]).
> 
> "drivers/staging/wilc1000/host_interface.c:3390 wilc_deinit()
>               warn: inconsistent returns 'hif_deinit_lock'."
> 
> Introduced in "ff52a57a7a42: staging: wilc1000: move the allocation of
> cmd out of wilc_enqueue_cmd()".

Can you use the Fixes tag so it's machine parseable?

Fixes: ff52a57a7a42 ("staging: wilc1000: move the allocation of cmd out of wilc_enqueue_cmd()")

With the fixes tag, say someone pulls ff52a57a7a42 into their code, they
will know to pull this patch as well.  Also scientists will be able to
measure the time between bug and fix and write a scholarly paper about
it.

regards,
dan carpenter

Re: [PATCH] staging: wilc1000: fix static checker warning to unlock mutex in wilc_deinit()

[Ajay Singh]

Hi Dan,

On Thu, 5 Jul 2018 11:41:26 +0300
Dan Carpenter <dan.carpenter@oracle.com> wrote:

> On Thu, Jul 05, 2018 at 09:18:53AM +0530, Ajay Singh wrote:
> > Fix for static checker warning inconsistent returns of
> > 'hif_deinit_lock'(more details [1]).
> > 
> > "drivers/staging/wilc1000/host_interface.c:3390 wilc_deinit()
> >               warn: inconsistent returns 'hif_deinit_lock'."
> > 
> > Introduced in "ff52a57a7a42: staging: wilc1000: move the allocation
> > of cmd out of wilc_enqueue_cmd()".  
> 
> Can you use the Fixes tag so it's machine parseable?
> 
> Fixes: ff52a57a7a42 ("staging: wilc1000: move the allocation of cmd
> out of wilc_enqueue_cmd()")

Thanks for your suggestion.
Will include the 'Fixes' tag and submit patch v2 version.

> 
> With the fixes tag, say someone pulls ff52a57a7a42 into their code,
> they will know to pull this patch as well.  Also scientists will be
> able to measure the time between bug and fix and write a scholarly
> paper about it.
> 
> regards,
> dan carpenter