Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752564AbcLCKXB (ORCPT ); Sat, 3 Dec 2016 05:23:01 -0500 Received: from m50-134.163.com ([123.125.50.134]:33748 "EHLO m50-134.163.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752104AbcLCKXA (ORCPT ); Sat, 3 Dec 2016 05:23:00 -0500 From: Pan Bian To: Kalle Valo , linux-wireless@vger.kernel.org, netdev@vger.kernel.org Cc: linux-kernel@vger.kernel.org, Pan Bian Subject: [PATCH 1/1] net: wireless: intersil: fix improper return value Date: Sat, 3 Dec 2016 18:22:52 +0800 Message-Id: <1480760572-4444-1-git-send-email-bianpan2016@163.com> X-Mailer: git-send-email 1.9.1 X-CM-TRANSID: DtGowABn6Cz8nEJYDNcfIg--.5856S3 X-Coremail-Antispam: 1Uf129KBjvdXoWrZFWDZw4kWrWDXF18Zw1kZrb_yoWfKrbEkr yxZFs7Wrn5tr4jgw1jkFWxZ3s2yr1kWFs5XrsxK39xW34UA3yakrn3ZFykAw1kur4Yyry3 CrnxJF1fJay7XjkaLaAFLSUrUUUUjb8apTn2vfkv8UJUUUU8Yxn0WfASr-VFAUDa7-sFnT 9fnUUvcSsGvfC2KfnxnUUI43ZEXa7IU5T89JUUUUU== X-Originating-IP: [222.131.246.88] X-CM-SenderInfo: held01tdqsiiqw6rljoofrz/1tbiVB41clUL+mrQMAAAsj Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 904 Lines: 28 Function orinoco_ioctl_commit() returns 0 (indicates success) when the call to orinoco_lock() fails. Thus, the return value is inconsistent with the execution status. It may be better to return "-EBUSY" when the call to orinoco_lock() fails. Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=188671 Signed-off-by: Pan Bian --- drivers/net/wireless/intersil/orinoco/wext.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/wireless/intersil/orinoco/wext.c b/drivers/net/wireless/intersil/orinoco/wext.c index 1d4dae4..fee57ea 100644 --- a/drivers/net/wireless/intersil/orinoco/wext.c +++ b/drivers/net/wireless/intersil/orinoco/wext.c @@ -1314,7 +1314,7 @@ static int orinoco_ioctl_commit(struct net_device *dev, return 0; if (orinoco_lock(priv, &flags) != 0) - return err; + return -EBUSY; err = orinoco_commit(priv); -- 1.9.1