From patchwork Wed Jan 6 04:58:58 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Abhishek Pandit-Subedi X-Patchwork-Id: 12000975 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-19.0 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 0DD2CC433DB for ; Wed, 6 Jan 2021 05:01:07 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id CC6BC22CAF for ; Wed, 6 Jan 2021 05:01:06 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726143AbhAFE7x (ORCPT ); Tue, 5 Jan 2021 23:59:53 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52816 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725792AbhAFE7x (ORCPT ); Tue, 5 Jan 2021 23:59:53 -0500 Received: from mail-pj1-x102c.google.com (mail-pj1-x102c.google.com [IPv6:2607:f8b0:4864:20::102c]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 8AC29C06134D for ; Tue, 5 Jan 2021 20:59:06 -0800 (PST) Received: by mail-pj1-x102c.google.com with SMTP id hk16so969197pjb.4 for ; Tue, 05 Jan 2021 20:59:06 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=o9pp+81pD9V5ZO1oudtV3NEzkiSbh9CAEsR5KS2cLrU=; b=eecW6ub0INs2zUQFbDtOijjrADBxTQ3+KIkXXktPtIhMY4WJDpJmz0G5PKyEtAnAOG F6w7KCIFkmpvy4e/XxRw5OcTQBFEY/ab7e80X2jhXlOP8PGphYT4txY9uInjvz5ap7zF P2wEo7r5E9ROHFOBRSe7i3t7ORS80205tjCUs= 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:mime-version :content-transfer-encoding; bh=o9pp+81pD9V5ZO1oudtV3NEzkiSbh9CAEsR5KS2cLrU=; b=pF9yHamJmcPMybrVUUz/c+m8tpbdqGTN/2xbuY4exBbMnxiqS812In/UmnhBw1I+QK 9OC03mDYyUwCYmk5s+Yxi2kL4GMRufhDovSzMTnBaS8UBX9sGBcaWYyDpiUHkYLzc9gf iVM9r97VbNJF078an9QgwYGtEqypgjyRzh2fakmOuDgSXnF379s9XmB4cJp6iKH0gcMj SGhNM29PWwNHZix9AqABnbde6oVLPk9zpEQw6LbnlYf+GLoCPnnvX3HspvKL8aUQLzIM 8kaBF9UkIv6RDVXNn+PpvnSe/WOLsA6+fde63DJPitiBlIQIYNNXmxV5cHHXpZbG84iS suTQ== X-Gm-Message-State: AOAM531rj5dCeUwGo/+HT75opJmOqqEXW14sqCTGf/ZkQkRVa+YJRwD/ FW2iJGzSVs98J+hh+3ZYKSkTfw== X-Google-Smtp-Source: ABdhPJwW59FjnNZUcdiKcpwcD/EYzFYWrPrpARJWVZMP+JxOv4bVf7mNf2em3OdX4BWmsvOZRXSSVQ== X-Received: by 2002:a17:90b:68d:: with SMTP id m13mr2468477pjz.164.1609909145953; Tue, 05 Jan 2021 20:59:05 -0800 (PST) Received: from apsdesk.mtv.corp.google.com ([2620:15c:202:1:7220:84ff:fe09:2b94]) by smtp.gmail.com with ESMTPSA id 22sm743287pjw.19.2021.01.05.20.59.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 05 Jan 2021 20:59:05 -0800 (PST) From: Abhishek Pandit-Subedi To: marcel@holtmann.org Cc: chromeos-bluetooth-upstreaming@chromium.org, linux-bluetooth@vger.kernel.org, Abhishek Pandit-Subedi , Johan Hedberg , Daniel Winkler , linux-kernel@vger.kernel.org, Luiz Augusto von Dentz Subject: [PATCH v2] Bluetooth: btrtl: Add null check in setup Date: Tue, 5 Jan 2021 20:58:58 -0800 Message-Id: <20210105205855.v2.1.I9438ef1f79fa1132e74c67b489123291080b9a8c@changeid> X-Mailer: git-send-email 2.29.2.729.g45daf8777d-goog MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-bluetooth@vger.kernel.org btrtl_dev->ic_info is only available from the controller on cold boot (the lmp subversion matches the device model and this is used to look up the ic_info). On warm boots (firmware already loaded), btrtl_dev->ic_info is null. Fixes: 05672a2c14a4 (Bluetooth: btrtl: Enable central-peripheral role) Signed-off-by: Abhishek Pandit-Subedi --- Changes in v2: - Added nullcheck with goto done drivers/bluetooth/btrtl.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/drivers/bluetooth/btrtl.c b/drivers/bluetooth/btrtl.c index 1abf6a4d6727..24f03a1f8d57 100644 --- a/drivers/bluetooth/btrtl.c +++ b/drivers/bluetooth/btrtl.c @@ -719,6 +719,9 @@ int btrtl_setup_realtek(struct hci_dev *hdev) */ set_bit(HCI_QUIRK_SIMULTANEOUS_DISCOVERY, &hdev->quirks); + if (!btrtl_dev->ic_info) + goto done; + /* Enable central-peripheral role (able to create new connections with * an existing connection in slave role). */ @@ -731,6 +734,7 @@ int btrtl_setup_realtek(struct hci_dev *hdev) break; } +done: btrtl_free(btrtl_dev); return ret; }