From patchwork Wed Dec 21 20:33:50 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rajat Jain X-Patchwork-Id: 707953 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 3tkRHV6Pckz9s1h for ; Thu, 22 Dec 2016 07:35:34 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=google.com header.i=@google.com header.b="A47Y3ODz"; dkim-atps=neutral Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757665AbcLUUeH (ORCPT ); Wed, 21 Dec 2016 15:34:07 -0500 Received: from mail-pg0-f44.google.com ([74.125.83.44]:35320 "EHLO mail-pg0-f44.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756855AbcLUUeF (ORCPT ); Wed, 21 Dec 2016 15:34:05 -0500 Received: by mail-pg0-f44.google.com with SMTP id i5so23949487pgh.2 for ; Wed, 21 Dec 2016 12:34:05 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=ZNPfIX2i5FEOSZahCmeP8FVSU+nlLRLCPs35J3UyJ5E=; b=A47Y3ODzu+aAEU7SWo2tZ9/5pfvljF2S2nXf8sXoBIsc2SClFAmkRqGAcROkhsVmDb D3WDpWgHu2Su4aThpCvxx3EhgkMWhE5t9ZD2bmmD60tKPRab8bJE6xMJF+usMipbnvYd ZB5QL4aiqbvuNa83RFTL4EEYgxFS+GqpFE1Kv1KTkmYVkoGOiElxRQHYABICd9JH4LaO ft/ePk7DGr2Olmyj3o1RzpCSMJqeKd7gca4rpRV2cYCdhE7OKRAgfV0a37VY75QaS6QB InrFKm9zOpT1PQpMjgDuFPamBBPIwd9GTgWig9jFZRa77g0pzlVXPtRWstWharlh+rUd EAgg== 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; bh=ZNPfIX2i5FEOSZahCmeP8FVSU+nlLRLCPs35J3UyJ5E=; b=UiskWNntj3ch8NsAXTbW7iZy8ocCTaXin78AKQpWM3NA5qrRMQNj5//bHPM8Xkit3n pghYL6Q+GQwIfnNM6b4myvU65tS9e8jjgCnoLlafbQXddGSNtGy1AusqgumLfy2s5Ex2 w5nN0mNHGIePOgHo6SkHKzqRVIc+vXdVxnLmGEKxqYher6efFw9E9VTFugHe+aTXo+y3 eOXKYIyqqVa+bJkPLbvz5MmEv1cgv502FrA3EWhp8/DMdIhRYzFjLGUO6KT98UvBZha1 nu3FT4/wC3g93HiDnqmuVqUeVk6p7XPwjdUFdMEmcyEKRKgHRr6u9V0vJKr/1PAbr67o hdnA== X-Gm-Message-State: AIkVDXL775YW/0EagwOFi7ZjBgtQdUCQK2nFmlpY7CHS9xMoOvt4n4RZuBTDmb8s6pWhwn4P X-Received: by 10.84.217.18 with SMTP id o18mr12257839pli.45.1482352444654; Wed, 21 Dec 2016 12:34:04 -0800 (PST) Received: from rajat.mtv.corp.google.com ([172.22.64.13]) by smtp.gmail.com with ESMTPSA id a11sm48905076pfe.96.2016.12.21.12.34.03 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 21 Dec 2016 12:34:04 -0800 (PST) From: Rajat Jain To: Rob Herring , Mark Rutland , Marcel Holtmann , Gustavo Padovan , Johan Hedberg , Amitkumar Karwar , Wei-Ning Huang , Xinming Hu , netdev@vger.kernel.org, devicetree@vger.kernel.org, linux-bluetooth@vger.kernel.org, Brian Norris , linux-kernel@vger.kernel.org Cc: Rajat Jain , rajatxjain@gmail.com Subject: [PATCH v4 1/3] Bluetooth: btusb: Use an error label for error paths Date: Wed, 21 Dec 2016 12:33:50 -0800 Message-Id: <1482352432-38302-1-git-send-email-rajatja@google.com> X-Mailer: git-send-email 2.8.0.rc3.226.g39d4020 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Use a label to remove the repetetive cleanup, for error cases. Signed-off-by: Rajat Jain Reviewed-by: Brian Norris --- v4: same as v3 v3: Added Brian's "Reviewed-by" v2: same as v1 drivers/bluetooth/btusb.c | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/drivers/bluetooth/btusb.c b/drivers/bluetooth/btusb.c index 2f633df..ce22cef 100644 --- a/drivers/bluetooth/btusb.c +++ b/drivers/bluetooth/btusb.c @@ -2991,18 +2991,15 @@ static int btusb_probe(struct usb_interface *intf, err = usb_set_interface(data->udev, 0, 0); if (err < 0) { BT_ERR("failed to set interface 0, alt 0 %d", err); - hci_free_dev(hdev); - return err; + goto out_free_dev; } } if (data->isoc) { err = usb_driver_claim_interface(&btusb_driver, data->isoc, data); - if (err < 0) { - hci_free_dev(hdev); - return err; - } + if (err < 0) + goto out_free_dev; } #ifdef CONFIG_BT_HCIBTUSB_BCM @@ -3016,14 +3013,16 @@ static int btusb_probe(struct usb_interface *intf, #endif err = hci_register_dev(hdev); - if (err < 0) { - hci_free_dev(hdev); - return err; - } + if (err < 0) + goto out_free_dev; usb_set_intfdata(intf, data); return 0; + +out_free_dev: + hci_free_dev(hdev); + return err; } static void btusb_disconnect(struct usb_interface *intf)