From patchwork Sat Dec 3 10:22:52 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pan Bian X-Patchwork-Id: 9459587 X-Patchwork-Delegate: kvalo@adurom.com Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 3353460515 for ; Sat, 3 Dec 2016 10:23:24 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 1C41028492 for ; Sat, 3 Dec 2016 10:23:24 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 10416284DE; Sat, 3 Dec 2016 10:23:24 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, FREEMAIL_FROM, RCVD_IN_DNSWL_HI autolearn=unavailable version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id CEBDA28492 for ; Sat, 3 Dec 2016 10:23:23 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752193AbcLCKXB (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 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=T6i884XzXMeJOHfLnTOlhUUYC77G26jpd+ vvWPqDBLLK3xtwAk6/oQd3B+a3+5x+KrTXcspaMksrSZqS+r90lByIuVqaR8wfT2 70sLbyMwoQk9lIUVZOslno6qHC6prp9rj0KKK/gfKUKuXP5cnyQ7NxDXtdM7P81/ yVOAktlbI= Received: from localhost.localdomain (unknown [222.131.246.88]) by smtp4 (Coremail) with SMTP id DtGowABn6Cz8nEJYDNcfIg--.5856S3; Sat, 03 Dec 2016 18:22:54 +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: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-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP 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);