From patchwork Wed Feb 1 22:24:08 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rajat Jain X-Patchwork-Id: 722693 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 3vDHkg0MB9z9s2s for ; Thu, 2 Feb 2017 09:25:15 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=google.com header.i=@google.com header.b="LMv2q6BW"; dkim-atps=neutral Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754038AbdBAWYT (ORCPT ); Wed, 1 Feb 2017 17:24:19 -0500 Received: from mail-pg0-f41.google.com ([74.125.83.41]:33092 "EHLO mail-pg0-f41.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753116AbdBAWYR (ORCPT ); Wed, 1 Feb 2017 17:24:17 -0500 Received: by mail-pg0-f41.google.com with SMTP id 204so112645208pge.0 for ; Wed, 01 Feb 2017 14:24:17 -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=2TUwodH8aT0d2NohQDReS1fSlJ+nqnOCvQG7aU5WNco=; b=LMv2q6BWQrg/MKlp9WFKLhdGM6xFB4/B0HjRiQJ/3DEjidVgnhhlnFxVncmA2QD0CH l/5Wm7Zmm/zKCaLlNoTkbErcKZgUHtTn3MyN7HkdDIzPBemMMI4up7sxvvG4gmJPfAyo qyqPPMbxv/6KknifbRjUUyKr2z9zdR3EoIvfdRF+SBcvUy3Juy0mj9HCvhcJoI9Lm0jE SG1hyhLeYez0zK3N4h2mABeSF2fauC54MeizUbz6Y4JYf3joCauBCsSvN+6tdXWUCCSc QeGlliqcTUIc3GV81x3FlwAz9nqLzHM6boE5wiSez7lx8lJWDt7eHpb2t2NAXBGj+AmK 4seQ== 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=2TUwodH8aT0d2NohQDReS1fSlJ+nqnOCvQG7aU5WNco=; b=CEF/OPXHLHLn8eQ6I5UOoTsXXHYjPv1l5nK+3A4iGUjimqHEYxG6ZW4w1HV/2WGw2+ 9PtoKwZiNrviDMot3dwsSOGFOcgh+eKsodBEGGiToS03tPk1+UAf8tu7xIxwCZlRxeBD 82EeK1p4Zm3+h9jhOSBL2KeFAWjr2Im2DEJLK/SpHx3ObqRf7Y7X2dasAmwmdf9d/Fm7 x7rgzgxFvRVuCWQoW+Fvvk+3KPHBz7OKxpXXRUxpq/eTSWSc/1k5ihugE8Vt3aRoxiNV ItLcZ1AYnXTp0cSl2WntWRUWfLTbOhflVuwAabXKyIpX+AByWffa+EmXnGnpophvxqpn XOCQ== X-Gm-Message-State: AIkVDXKxOWgrhKBGvSrI9dqPdcbntQelp8675ZxdnEwGJyhR5BDagUhJ8cHZNrWT26ZS5Kus X-Received: by 10.98.204.83 with SMTP id a80mr6439155pfg.114.1485987856327; Wed, 01 Feb 2017 14:24:16 -0800 (PST) Received: from rajat.mtv.corp.google.com ([172.22.64.13]) by smtp.gmail.com with ESMTPSA id p14sm52213489pfl.75.2017.02.01.14.24.15 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 01 Feb 2017 14:24: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 v7 1/3] Bluetooth: btusb: Use an error label for error paths Date: Wed, 1 Feb 2017 14:24:08 -0800 Message-Id: <20170201222410.145612-1-rajatja@google.com> X-Mailer: git-send-email 2.11.0.483.g087da7b7c-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 --- v7: same as v6 v6: same as v5 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)