From patchwork Tue Aug 17 14:06:13 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Petko Manolov X-Patchwork-Id: 499643 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-18.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER, INCLUDES_PATCH, MAILING_LIST_MULTI, SPF_HELO_NONE, SPF_PASS, URIBL_BLOCKED, USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id C67CCC432BE for ; Tue, 17 Aug 2021 14:06:22 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id A56F060232 for ; Tue, 17 Aug 2021 14:06:22 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237687AbhHQOGy (ORCPT ); Tue, 17 Aug 2021 10:06:54 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51118 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230412AbhHQOGw (ORCPT ); Tue, 17 Aug 2021 10:06:52 -0400 Received: from mail-ed1-x535.google.com (mail-ed1-x535.google.com [IPv6:2a00:1450:4864:20::535]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E3D11C061764 for ; Tue, 17 Aug 2021 07:06:18 -0700 (PDT) Received: by mail-ed1-x535.google.com with SMTP id n12so31738515edx.8 for ; Tue, 17 Aug 2021 07:06:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=konsulko.com; s=google; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=CdDL5AuT3Bs0uFae8Pg/Ul5HRY3EkJ1Dqs4rzwcsJNI=; b=U8jX7z3CrDDp6+F52kbHN8E+HQApjRmNj03u4ddDW7emK+K1DpHAM20Q0uh4VI2yLt Bk0nQHabyZVWT9bOC9Zm/jXq3CZAY2BKtPPZoiewzlfQpAuzpTd8NN2e0ayGHocPBMoZ 1C8rXhbpS1qpy8IVLqApcOreIJkIHqI03lKmI= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=CdDL5AuT3Bs0uFae8Pg/Ul5HRY3EkJ1Dqs4rzwcsJNI=; b=Wcdbh6gzC11BKILiIj92cWDQL3UqFZ3yJfVFP7Bpip38Wel/Q6LUZkY33V4ykUelzY wdIc3KywfYrIZYjwfMpi1Fi0A+SYn4a+4gTIfLukVzEuBbhs5xnoAumEiG390R7M9vdQ oHc4s3KZinC7e5pwfv4G2hNz4XiGQeo/RJYUzrLYiB91+0Hx6LiPTfoEcbdv3zV2x6y9 zPABuhwwDI55vATArKEXn+4p49BqGLbCDKR86hHMnoyhirBxqiSR10UtSjrfqO3mb1T/ 7kGnkXuWCf2ZmmLcEuNT8GJkWnrIoLGOG6ShgbzDx2dOg5btA8vgJdiOL7LMQstOZnhO guKA== X-Gm-Message-State: AOAM530ZooMFMNwl1PNqP6/x+ZjXwHBc7tq4IIGOikejyZwmNW2UgKUb VmdzYi4ge0mwuIijRsAYllB9pk/hx7J/dQ== X-Google-Smtp-Source: ABdhPJzSjBuN+jxgZf6yvGFsuGAaS9DCypuWJ1WYJ+UN9KZRPzkm7P/DK0cfCxZSeAyJFq/BNyg4JA== X-Received: by 2002:a05:6402:4406:: with SMTP id y6mr4252518eda.242.1629209177007; Tue, 17 Aug 2021 07:06:17 -0700 (PDT) Received: from taos.k.g (lan.nucleusys.com. [92.247.61.126]) by smtp.gmail.com with ESMTPSA id cn16sm1130702edb.9.2021.08.17.07.06.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 17 Aug 2021 07:06:16 -0700 (PDT) From: Petko Manolov To: netdev@vger.kernel.org Cc: kuba@kernel.org, paskripkin@gmail.com, stable@vger.kernel.org, davem@davemloft.net, Petko Manolov Subject: [PATCH] net: usb: pegasus: fixes of set_register(s) return value evaluation; Date: Tue, 17 Aug 2021 17:06:13 +0300 Message-Id: <20210817140613.27737-1-petko.manolov@konsulko.com> X-Mailer: git-send-email 2.30.2 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org - restore the behavior in enable_net_traffic() to avoid regressions - Jakub Kicinski; - hurried up and removed redundant assignment in pegasus_open() before yet another checker complains; - explicitly check for negative value in pegasus_set_wol(), even if usb_control_msg_send() never return positive number we'd still be in sync with the rest of the driver style; Signed-off-by: Petko Manolov --- drivers/net/usb/pegasus.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/net/usb/pegasus.c b/drivers/net/usb/pegasus.c index 652e9fcf0b77..1ef93082c772 100644 --- a/drivers/net/usb/pegasus.c +++ b/drivers/net/usb/pegasus.c @@ -446,7 +446,7 @@ static int enable_net_traffic(struct net_device *dev, struct usb_device *usb) write_mii_word(pegasus, 0, 0x1b, &auxmode); } - return 0; + return ret; fail: netif_dbg(pegasus, drv, pegasus->net, "%s failed\n", __func__); return ret; @@ -835,7 +835,7 @@ static int pegasus_open(struct net_device *net) if (!pegasus->rx_skb) goto exit; - res = set_registers(pegasus, EthID, 6, net->dev_addr); + set_registers(pegasus, EthID, 6, net->dev_addr); usb_fill_bulk_urb(pegasus->rx_urb, pegasus->usb, usb_rcvbulkpipe(pegasus->usb, 1), @@ -932,7 +932,7 @@ pegasus_set_wol(struct net_device *dev, struct ethtool_wolinfo *wol) pegasus->wolopts = wol->wolopts; ret = set_register(pegasus, WakeupControl, reg78); - if (!ret) + if (ret < 0) ret = device_set_wakeup_enable(&pegasus->usb->dev, wol->wolopts); return ret;