From patchwork Fri Dec 16 19:30:02 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rajat Jain X-Patchwork-Id: 706549 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 3tgL4b4Nlvz9t17 for ; Sat, 17 Dec 2016 06:30:23 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=google.com header.i=@google.com header.b="ivmBvyET"; dkim-atps=neutral Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1759322AbcLPTaT (ORCPT ); Fri, 16 Dec 2016 14:30:19 -0500 Received: from mail-pg0-f48.google.com ([74.125.83.48]:36451 "EHLO mail-pg0-f48.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1759282AbcLPTaQ (ORCPT ); Fri, 16 Dec 2016 14:30:16 -0500 Received: by mail-pg0-f48.google.com with SMTP id f188so35133236pgc.3 for ; Fri, 16 Dec 2016 11:30:16 -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=0PypCgIRhci2MZQvBUInx+/8KRp912lijS0JnXMOkpE=; b=ivmBvyETZHHrQhY/Xmv/s+XWfgjm3xeTpDPPHS5VJWn0NtKcImGRAULWIV7eP7pZ6O eq268VYWXldR9zXyqsBV7K4g6DBp3wUT1r3VEF3oGoEEDT9uDThTLhahaXcBWfEdm+88 pHUYCIMf1Uq6rDR7sQV0THjzW2c4C6zLL/9z9jHWs1UweXbRUjU3ntSkqlwr69tMe0j0 dDT4MCOFynQuLEO/dTYdxi1l6fuabjwCFdhg7A6om17ecZfnJygVCLnYOGK1Cs8DnZz+ tsvJFTVAzjhxP7HfVeuQV+SjdfCpEREn4cb6lGi6a39JODRzOjplh/qPHEVKhsVwfkfo yUDA== 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=0PypCgIRhci2MZQvBUInx+/8KRp912lijS0JnXMOkpE=; b=OC5D1e0rkRCZMFKysWO7/BVPR3QS0gaU8aadMMFn4kRSAZ31czECe5BAIQ9ptObA8V B9l8qjDm4ih0egVumBPbmth61b1IEWMLsZC5ohiD4roZYK8QS/auzGv6+n8ITkimCCKY tttH1EbPofLFT3WFBdig4ZopS9npQdAYhoA6HYsvE0EBn7p/yZoJRpWbClAj7iI2c+Yu TGRcZ/AQW+ocaxUwONzDMAsxl8RbKR+c/y8bazJp1qFAuNUwAvX/fVAjLKLkTPXxAGy+ 4nJF+R30OH+EkGB0Anrs5fEJsmTtHFCzQlWy+gY7t9AytGDjHH0oQJ8CZYN7QDaJuBUZ +yNg== X-Gm-Message-State: AIkVDXIg3iQaLBNNy9ZNR8ob+yQAGc8plshzWHA0+Be1ryA/5HHs8G951BL6D3glU0ZPmkiX X-Received: by 10.99.115.76 with SMTP id d12mr938068pgn.56.1481916616097; Fri, 16 Dec 2016 11:30:16 -0800 (PST) Received: from rajat.mtv.corp.google.com ([172.22.64.13]) by smtp.gmail.com with ESMTPSA id l7sm13684173pfg.35.2016.12.16.11.30.15 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 16 Dec 2016 11:30:15 -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 v2 1/3] Bluetooth: btusb: Use an error label for error paths Date: Fri, 16 Dec 2016 11:30:02 -0800 Message-Id: <1481916604-114279-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 --- 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)