From patchwork Fri Aug 24 08:17:49 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lorenzo Bianconi X-Patchwork-Id: 10574897 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-2.web.codeaurora.org (Postfix) with ESMTP id D10EE14E1 for ; Fri, 24 Aug 2018 08:17:56 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id BD8192B5B2 for ; Fri, 24 Aug 2018 08:17:56 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id AEBA62B5C9; Fri, 24 Aug 2018 08:17:56 +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.9 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_DNSWL_HI autolearn=ham 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 4B0F42B5B2 for ; Fri, 24 Aug 2018 08:17:56 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726995AbeHXLv1 (ORCPT ); Fri, 24 Aug 2018 07:51:27 -0400 Received: from mail-wr1-f65.google.com ([209.85.221.65]:38184 "EHLO mail-wr1-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726891AbeHXLv1 (ORCPT ); Fri, 24 Aug 2018 07:51:27 -0400 Received: by mail-wr1-f65.google.com with SMTP id w11-v6so6741553wrc.5 for ; Fri, 24 Aug 2018 01:17:54 -0700 (PDT) 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:in-reply-to :references; bh=/x+CMo/kQuCit5+8H5e5h1WFSQ+xtBkHW1Z0TemsSnE=; b=HxGuzatB7mE3eZq/lFN1meeN++i9UtbmzE+Ac7JodqFNC72eqZLKfODBoEt+cY2ZQN FHoBI30MqeCfsLFbCpJUVEosLJ3bHR0Be5lzsmyhk/kI5ruIeFpBRYlC9tPKt4Emeovz oWgaE6moyr1K57DwByyLzfkfCOhHXg16dpVkKf9qKWVW4hdN76YS0wqTHPLKXplp+xX+ OdDu/L9gqzyPnUcTBwQ08ChWKf1fED2T6Pg6+ppUKS2LqT6mq3plxlp82QXL5pVtYRxy //c6lIVbvQbvOogDqNZEylwLKonlANxtbuyk4+m25ve0SmwdwiIYZk37wydm/jaKl3y7 +Hlw== X-Gm-Message-State: APzg51Bhe8DPC//M6Swf2rOgvbLxchVrOYnq/sHEjy+FbKlqcwdIS1FP O+wjYSsE880MlwY6A+EVYTuHhA8YIEA= X-Google-Smtp-Source: ANB0VdbWaRkS6Rmmqw9BwFIBsDCEBLR482AZjvEdYPK5N+uZvQhCl4I1g7jlQgqECPuR+jAODI46CA== X-Received: by 2002:adf:fd90:: with SMTP id d16-v6mr505961wrr.276.1535098673655; Fri, 24 Aug 2018 01:17:53 -0700 (PDT) Received: from localhost.localdomain.com (nat-pool-mxp-t.redhat.com. [149.6.153.186]) by smtp.gmail.com with ESMTPSA id x23-v6sm557724wmh.26.2018.08.24.01.17.52 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Fri, 24 Aug 2018 01:17:53 -0700 (PDT) From: Lorenzo Bianconi To: nbd@nbd.name Cc: linux-wireless@vger.kernel.org Subject: [PATCH] mt76x2u: run device cleanup routine if resume fails Date: Fri, 24 Aug 2018 10:17:49 +0200 Message-Id: <61ca93f6c7f8fae2714b7265cb84bc36469eecb4.1535098373.git.lorenzo.bianconi@redhat.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: References: 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 Cleanup {tx,rx} and mcu queues if resume operation fails Fixes: ee676cd5017c ("mt76: add driver code for MT76x2u based devices") Signed-off-by: Lorenzo Bianconi --- drivers/net/wireless/mediatek/mt76/mt76x2_usb.c | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/drivers/net/wireless/mediatek/mt76/mt76x2_usb.c b/drivers/net/wireless/mediatek/mt76/mt76x2_usb.c index 1428cfdee579..9594433234cc 100644 --- a/drivers/net/wireless/mediatek/mt76/mt76x2_usb.c +++ b/drivers/net/wireless/mediatek/mt76/mt76x2_usb.c @@ -107,16 +107,24 @@ static int __maybe_unused mt76x2u_resume(struct usb_interface *intf) mt76u_mcu_complete_urb, &usb->mcu.cmpl); if (err < 0) - return err; + goto err; err = mt76u_submit_rx_buffers(&dev->mt76); if (err < 0) - return err; + goto err; tasklet_enable(&usb->rx_tasklet); tasklet_enable(&usb->tx_tasklet); - return mt76x2u_init_hardware(dev); + err = mt76x2u_init_hardware(dev); + if (err < 0) + goto err; + + return 0; + +err: + mt76x2u_cleanup(dev); + return err; } MODULE_DEVICE_TABLE(usb, mt76x2u_device_table);