From patchwork Tue Dec 20 02:56:30 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rajat Jain X-Patchwork-Id: 707292 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 3tjMv54m0Kz9t1F for ; Tue, 20 Dec 2016 13:59:13 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=google.com header.i=@google.com header.b="chaLY/yJ"; dkim-atps=neutral Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756885AbcLTC4q (ORCPT ); Mon, 19 Dec 2016 21:56:46 -0500 Received: from mail-pf0-f178.google.com ([209.85.192.178]:32845 "EHLO mail-pf0-f178.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753439AbcLTC4o (ORCPT ); Mon, 19 Dec 2016 21:56:44 -0500 Received: by mail-pf0-f178.google.com with SMTP id d2so26456356pfd.0 for ; Mon, 19 Dec 2016 18:56:44 -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=5YQdQ2G11U2zXWCeYBhtfqE9BlwMMBUuidJi9hmGY+c=; b=chaLY/yJaDU6kzPyuWHGbH6qsfBvBKbEZ2mr6O8K2Bsja0uXK3ymTWFcedpWedJUHS D3BufSO6v86+wQNak9WuQItxd6cIa+kwuL4NxNmx/VDZJOC0UMKJClw59jzvdcgzgaqf rFQ9/Fe0S94thdsmrMPIRewHHP99FKrkaIMjmIYASu17HS1f1iTiII/jJA61NknzWNRA u1VWNmAY/1tmWxN64lEuMu8STrLbGr1e+pmEF/UHWj7eaRK9+Denfdosp1HcjX+UR90l FCBWenKWAeiQ5+sgOBTtA/RiLoJfhPJrb6eR2xg4fRrShiPagkZH4uAQJq+5zN52aGKn bMNQ== 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=5YQdQ2G11U2zXWCeYBhtfqE9BlwMMBUuidJi9hmGY+c=; b=L2NMkRHz5XnuggJbwJm72DoSXYZwaWoGM0ZqQE1chpj+CGyh+TUDkGQ1ojAA2abVBh Q7FMgafcpy1XqYFuT/niqtmk1+Psu4C8j12xr5qGDwNILuDwTy7bffgY5mmlpgwwgUX3 PUXFoLWOTTUergoL351++WwCYOxT03BxCfv/aIjXSAVU2J2lgl82DlJW/NeTpmZRaY5r RZCadWUgFMlq7NIkUNd6J/gutE3jvBk/ue1/Iar11KuoAQyHiEpeASvN1+9sVRn/kYJ7 9s6eEYRW9xJNxxaZO+UWV6edBMHLMdCYNEi1DOB6xyxH+/PCjF8DqYEkcqbEs2/iQjwu tfRw== X-Gm-Message-State: AKaTC02hBaMFSd6XwSo3U3GS16yjN3EmTF+OSsFPUw6G2CEPfT9pVrByMYT8XhkuHy1jpguH X-Received: by 10.99.108.8 with SMTP id h8mr32272617pgc.93.1482202603633; Mon, 19 Dec 2016 18:56:43 -0800 (PST) Received: from rajat.mtv.corp.google.com ([172.22.64.13]) by smtp.gmail.com with ESMTPSA id s3sm2126929pfg.14.2016.12.19.18.56.42 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 19 Dec 2016 18:56:43 -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 v3 1/3] Bluetooth: btusb: Use an error label for error paths Date: Mon, 19 Dec 2016 18:56:30 -0800 Message-Id: <1482202592-76314-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 --- 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)