From patchwork Sat Dec 3 10:18:40 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pan Bian X-Patchwork-Id: 702293 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3tW6ny2NKLz9t0v for ; Sat, 3 Dec 2016 21:34:13 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=163.com header.i=@163.com header.b="aIRwvcvC"; dkim-atps=neutral Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751601AbcLCKeE (ORCPT ); Sat, 3 Dec 2016 05:34:04 -0500 Received: from m50-135.163.com ([123.125.50.135]:47193 "EHLO m50-135.163.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750912AbcLCKeD (ORCPT ); Sat, 3 Dec 2016 05:34:03 -0500 X-Greylist: delayed 913 seconds by postgrey-1.27 at vger.kernel.org; Sat, 03 Dec 2016 05:34:02 EST DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=163.com; s=s110527; h=From:Subject:Date:Message-Id; bh=efsae6kV4Z/n9MX5IH SShyFpPnMDMc+T3jDa/yN/1CE=; b=aIRwvcvCU/qY8YLuRDtY5X/OCPShJt5dGr AioMu3vDNISrJm8+PwbHfKVoI+Fb6d/EjPYICVAyR5JVfvqLsHATXGshr6g+F0Uv NJPzHlR8Fg0wi+CudtLcx1Mo79MuVpYGtIAKLeaOYsOYWi8lSYqqTsdYW/NyX73A F7WNPuJLY= Received: from localhost.localdomain (unknown [222.131.246.88]) by smtp5 (Coremail) with SMTP id D9GowAAHjrL_m0JYSZSDIA--.33408S3; Sat, 03 Dec 2016 18:18:43 +0800 (CST) 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:18:40 +0800 Message-Id: <1480760320-4380-1-git-send-email-bianpan2016@163.com> X-Mailer: git-send-email 1.9.1 X-CM-TRANSID: D9GowAAHjrL_m0JYSZSDIA--.33408S3 X-Coremail-Antispam: 1Uf129KBjvdXoWrZFWDZw4kWrWDXF18Zw1kZrb_yoWfKrbEkr yxZFs7Wrn5tr4jgw1jkFWxZ3s2yr1kWFs5XrsxK39xW34UA3yakrn3ZFykAw1kur4Yyry3 CrnxJF1fJay7XjkaLaAFLSUrUUUUUb8apTn2vfkv8UJUUUU8Yxn0WfASr-VFAUDa7-sFnT 9fnUUvcSsGvfC2KfnxnUUI43ZEXa7IUeBWlDUUUUU== X-Originating-IP: [222.131.246.88] X-CM-SenderInfo: held01tdqsiiqw6rljoofrz/xtbBzwY1claDscbiigABsF Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org 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);