From mboxrd@z Thu Jan 1 00:00:00 1970 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=-9.0 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,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 D966EC169C4 for ; Mon, 11 Feb 2019 16:01:50 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id A1E5C21A80 for ; Mon, 11 Feb 2019 16:01:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1549900910; bh=GAQHXKYCus6kzfE8npf8N/mWqU7J1VcDwLbyFb9HHX4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=y0faZUuoEzeyDZlt+NWu31zNcjeCar1VC5EqLYsyFkfiZzzqNitqWSafiRAM8Jk3o 2er3NXJg/guC1UDmU+p21CWrzwZLI72QWC33NCyOgEmbRecQHlhlOQQDFwXjzYHG5V n/Nt8lBa6iz41vlYOA+sEQI06kjhJQdjniHjfCj4= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730189AbfBKOaw (ORCPT ); Mon, 11 Feb 2019 09:30:52 -0500 Received: from mail.kernel.org ([198.145.29.99]:37386 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730187AbfBKOaw (ORCPT ); Mon, 11 Feb 2019 09:30:52 -0500 Received: from localhost (5356596B.cm-6-7b.dynamic.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 27E6120844; Mon, 11 Feb 2019 14:30:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1549895451; bh=GAQHXKYCus6kzfE8npf8N/mWqU7J1VcDwLbyFb9HHX4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=oQfZ4Ma7dcsZWu+SlO+1dZ8uriaT8NHGLrtmpWgKWcDKv6//D57l+NZbcy/aYzAgi mSxWej75F7v/cc8x9hHwTIHBoF1ss9q+dBiji9rHmhtxK3GLH5/XMWIa+zofUamiSC wcCNxUqq9QaQ8mYnJVQsz3VvMv3ZLuNhFRtmQw8U= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Ondrej Jirman , Chen-Yu Tsai , Marcel Holtmann , Sasha Levin Subject: [PATCH 4.20 208/352] Bluetooth: hci_bcm: Handle deferred probing for the clock supply Date: Mon, 11 Feb 2019 15:17:15 +0100 Message-Id: <20190211141900.404024176@linuxfoundation.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190211141846.543045703@linuxfoundation.org> References: <20190211141846.543045703@linuxfoundation.org> User-Agent: quilt/0.65 X-stable: review X-Patchwork-Hint: ignore MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org 4.20-stable review patch. If anyone has any objections, please let me know. ------------------ [ Upstream commit 28ac03b9ac3f784c2f048a910c8d0a7a87483b66 ] On some systems that actually have the bluetooth controller wired up with an extra clock signal, it's possible the bluetooth controller probes before the clock provider. clk_get would return a defer probe error, which was not handled by this driver. Handle this properly, so that these systems can work reliably. Tested-by: Ondrej Jirman Signed-off-by: Chen-Yu Tsai Signed-off-by: Marcel Holtmann Signed-off-by: Sasha Levin --- drivers/bluetooth/hci_bcm.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/drivers/bluetooth/hci_bcm.c b/drivers/bluetooth/hci_bcm.c index ddbd8c6a0ceb..800132369134 100644 --- a/drivers/bluetooth/hci_bcm.c +++ b/drivers/bluetooth/hci_bcm.c @@ -907,6 +907,10 @@ static int bcm_get_resources(struct bcm_device *dev) dev->clk = devm_clk_get(dev->dev, NULL); + /* Handle deferred probing */ + if (dev->clk == ERR_PTR(-EPROBE_DEFER)) + return PTR_ERR(dev->clk); + dev->device_wakeup = devm_gpiod_get_optional(dev->dev, "device-wakeup", GPIOD_OUT_LOW); if (IS_ERR(dev->device_wakeup)) -- 2.19.1