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.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham 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 50562C282C8 for ; Mon, 28 Jan 2019 15:54:41 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 137D620855 for ; Mon, 28 Jan 2019 15:54:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1548690881; bh=M/L/KkkVWTaMFTlnaCMwvmp7gOGTNLIncZpVATojgJc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=H6ZQ92B3wy3/J2W3JrIy5zuuLIMGhy+QU4X8YhdPylTjzJ5VLPlekdv2QjgFq4fUz 30qP37kIrTbYtDJeaCeNtoAvngOAR0MENS6+wvWcnVsOAKN7f0UZMr6XuwZryTLAqD EIrjCxAlSe+52EQvJmhgmkjtTRE3Ged/xOJ7to3s= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729729AbfA1Pyj (ORCPT ); Mon, 28 Jan 2019 10:54:39 -0500 Received: from mail.kernel.org ([198.145.29.99]:40738 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729721AbfA1Pyg (ORCPT ); Mon, 28 Jan 2019 10:54:36 -0500 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 3560B20989; Mon, 28 Jan 2019 15:54:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1548690876; bh=M/L/KkkVWTaMFTlnaCMwvmp7gOGTNLIncZpVATojgJc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=yZdZOExP4cl5WQOGNgxhSzF5asS3sxWGa9GB8GtfCuqr4cKXg0mcw/5C8u1V2EWkB 2g3fgvkIjWKAHzoz2fxfmTp1BPJ2ctRjKJfrKPdHbwPV1LUxQ/iWeZsMTAKrSFG9eu Oc+USQ7z9eleDdEEYHJL/VrzueENGel586d/OyyM= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Chen-Yu Tsai , Marcel Holtmann , Sasha Levin , linux-bluetooth@vger.kernel.org Subject: [PATCH AUTOSEL 4.20 220/304] Bluetooth: hci_bcm: Handle deferred probing for the clock supply Date: Mon, 28 Jan 2019 10:42:17 -0500 Message-Id: <20190128154341.47195-220-sashal@kernel.org> X-Mailer: git-send-email 2.19.1 In-Reply-To: <20190128154341.47195-1-sashal@kernel.org> References: <20190128154341.47195-1-sashal@kernel.org> MIME-Version: 1.0 X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Chen-Yu Tsai [ 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