Received: by 2002:a05:7412:f584:b0:e2:908c:2ebd with SMTP id eh4csp1223949rdb; Mon, 4 Sep 2023 06:59:17 -0700 (PDT) X-Google-Smtp-Source: AGHT+IH4MAO/rTkwGy+7zrXOG8PZFW7GPo+kofqnm52o0JNVB+1CDZ7sUHbovHT0thz1ectpFEi+ X-Received: by 2002:a05:6a20:7d93:b0:136:42c8:693c with SMTP id v19-20020a056a207d9300b0013642c8693cmr10816658pzj.6.1693835957549; Mon, 04 Sep 2023 06:59:17 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1693835957; cv=none; d=google.com; s=arc-20160816; b=QQBZ36utzra72j9+AjwVolbW60FJeOBN7OlBIUClZ31erpcsW13L1rx0/BJJr9oMQM VFUx3aJPQneFFlDE5GmQY8t/zO/wjbFNj6X1PomtttY1rkSUuJGJ0+wd/UNSfrQWeZ0w bTkfiUGTaAhrDUgc/hUQ0XeFWklmhpzaI7vZ1z8ifzWJ0BbPlcRPrzozD/4Y9KknE1Vz fC3ijxGLYsSuzExQqKfmAbVrNeLopQb4KlIjEQfsAa1BcyaAqnVbQhG8xrmDqXGwEQW3 LaIO0SoNHYGSVEOG23ubUxzB5psL3Re6MKCm5eG42yDJt/w+6MPPI42bSiX569mKKTqc yP/A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from; bh=Q2h/fUEb2uYL0Zxe7d7pZKkvCqCNcHfNt7DAz021SwQ=; fh=FDnUkOaEzm15K0Zz2pRbIY6ufBa8VWjoRjVlaBxAYMM=; b=GmXT/ep7vCdv78EobSp3ZNUIiRXsVUbmv2UDavBdrh+s9j3QyeYKD5KAREXLcgMyi1 Izoc3b8YiN22v+bv/CRl+DSvoCfSun2BY0fOuRDwcjUnTkuuIS4gG+0d96QOObulrv14 YBIq8G0SS0khZHv9So/kizp7iP20t+lEM6CDRpc6t4SBvoh9bwpAoyncFDWEV5BcPKEH zPlHk7hQjOS8EGtXFTGrqrBbvJYuZJajubqqMCjlaCLrmm9Up7q+IzO6cZAhMYfMySwo Tu2ZqJhRyvWWkkFc9IWVizYJhOSryp21nEQ2t2g3cz5TzWTTLbgE8f418h3Hr+xeGEMM a10A== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id fj14-20020a056a003a0e00b0068beaad4989si7793201pfb.181.2023.09.04.06.59.04; Mon, 04 Sep 2023 06:59:17 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237109AbjICMdi (ORCPT + 99 others); Sun, 3 Sep 2023 08:33:38 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36686 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229943AbjICMdh (ORCPT ); Sun, 3 Sep 2023 08:33:37 -0400 Received: from hust.edu.cn (mail.hust.edu.cn [202.114.0.240]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C220D126; Sun, 3 Sep 2023 05:33:33 -0700 (PDT) Received: from localhost.localdomain ([172.16.0.254]) (user=dzm91@hust.edu.cn mech=LOGIN bits=0) by mx1.hust.edu.cn with ESMTP id 383CWVTj004330-383CWVTk004330 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NO); Sun, 3 Sep 2023 20:32:36 +0800 From: Dongliang Mu To: =?UTF-8?q?Toke=20H=C3=B8iland-J=C3=B8rgensen?= , Kalle Valo Cc: hust-os-kernel-patches@googlegroups.com, Dongliang Mu , linux-wireless@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH] ath9k: unify error handling code in ath9k_hif_usb_resume Date: Sun, 3 Sep 2023 20:32:29 +0800 Message-Id: <20230903123230.2116129-1-dzm91@hust.edu.cn> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-FEAS-AUTH-USER: dzm91@hust.edu.cn X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,SPF_HELO_PASS, SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org In ath9k_hif_usb_resume, the error handling code calls ath9k_hif_usb_dealloc_urbs twice in different paths. To unify the error handling code, we replace one error handling path with a goto statement. Note that this patch does not incur any functionability change. Signed-off-by: Dongliang Mu --- drivers/net/wireless/ath/ath9k/hif_usb.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/net/wireless/ath/ath9k/hif_usb.c b/drivers/net/wireless/ath/ath9k/hif_usb.c index e5414435b141..dcc01274b008 100644 --- a/drivers/net/wireless/ath/ath9k/hif_usb.c +++ b/drivers/net/wireless/ath/ath9k/hif_usb.c @@ -1502,8 +1502,8 @@ static int ath9k_hif_usb_resume(struct usb_interface *interface) if (ret) goto fail_resume; } else { - ath9k_hif_usb_dealloc_urbs(hif_dev); - return -EIO; + ret = -EIO; + goto fail_resume; } mdelay(100); -- 2.25.1