From patchwork Thu Jan 12 18:01:05 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rajat Jain X-Patchwork-Id: 714575 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 3tzttb0NCRz9t15 for ; Fri, 13 Jan 2017 05:04:07 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=google.com header.i=@google.com header.b="CtUvXZ5T"; dkim-atps=neutral Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751379AbdALSBn (ORCPT ); Thu, 12 Jan 2017 13:01:43 -0500 Received: from mail-pf0-f175.google.com ([209.85.192.175]:34811 "EHLO mail-pf0-f175.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750730AbdALSBP (ORCPT ); Thu, 12 Jan 2017 13:01:15 -0500 Received: by mail-pf0-f175.google.com with SMTP id 127so16452745pfg.1 for ; Thu, 12 Jan 2017 10:01:15 -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=jRrFAPrJ9Jp4OBROQ3MZ75aPikhEQ3OqU0vXnNW5R08=; b=CtUvXZ5Tg/wupZnBaWhf7yhDhB/JR7MoJ+m3w2CYtwkMSOmSSbs3f3vHBSDWgnnO4p NJNI54d/Nka5HSZb7YRYPtFpoMASZPX79A9JXAyHhX7Bh14rjKayUvHtZvXToPb+uUX1 7vQIYUenxYpliDlyBG5iMS7AvY7U1TCk4zJ7sAuF/rKR9OGdQCO6iKMsEVCn7H7uWlZq W2RjMpMcbuUe6VBw9BpVEmUjwps3SKI1hymdb32Ml0RcwuYco7W1A/Ac/f1V0Hh9XKGE Pzy99S8p5OWUuUk25zOgZilR38U9L0EvjKUEtLwSYL1iQmI7hFF16iCqiepJB+3ss3nR fcEw== 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=jRrFAPrJ9Jp4OBROQ3MZ75aPikhEQ3OqU0vXnNW5R08=; b=T5R4wCPeHhrhQMoiLDaG3xG7rCSem34l2KuA+JiyEJe4scM4zYtEazG9lGQMVafV6r ukVvJm8x/8TkFDTZotp9FJTm8ntphIrxcXtZHLsEYsbnFvz5Y8g32zDZCpHWF1Sn7Dcp wzW1y4ALAIcrAIxHVbFmjGyS+puzJ/bz/UbjI3hDTBh9lGC0PT23ffalTg+vYQ/fdcWX AIubkn52HbA/5cpgAwChhnhEPe6eV7d27wIbK9w0fJVMZTdISuArgS769SMkhdRIEwDo cvRp+ddTki3AV7NaNLPOqyyuhblduj3yq9UhYacuPUUJ7ov5qjsdxgyvu7vmCSOLCbea bBiA== X-Gm-Message-State: AIkVDXJUyLeLYKwKPph45nlNOZaLjL1muGITJ+i5PwMOUndBaQefBG+9lsJHgT+n7Of7si8G X-Received: by 10.99.61.13 with SMTP id k13mr18951556pga.154.1484244074851; Thu, 12 Jan 2017 10:01:14 -0800 (PST) Received: from rajat.mtv.corp.google.com ([172.22.64.13]) by smtp.gmail.com with ESMTPSA id z70sm6942131pff.26.2017.01.12.10.01.13 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 12 Jan 2017 10:01:14 -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 v5 1/3] Bluetooth: btusb: Use an error label for error paths Date: Thu, 12 Jan 2017 10:01:05 -0800 Message-Id: <20170112180107.63244-1-rajatja@google.com> X-Mailer: git-send-email 2.11.0.390.gc69c2f50cf-goog 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 --- v5: same as v4 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 2f633df9f4e6..ce22cefceed1 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)