summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJiasheng Jiang <jiasheng@iscas.ac.cn>2021-12-24 10:53:18 +0800
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2022-01-27 09:04:20 +0100
commit33278f3be6065282398f38259ac44dd407d03d88 (patch)
tree3b25aa4af1de92bb18fef65dd0f7b6cbe2b613a9
parent97ffb72a34435120f922fe1d86ed66ff8ec4f423 (diff)
downloadlinux-stable-33278f3be6065282398f38259ac44dd407d03d88.tar.gz
linux-stable-33278f3be6065282398f38259ac44dd407d03d88.tar.bz2
linux-stable-33278f3be6065282398f38259ac44dd407d03d88.zip
Bluetooth: hci_bcm: Check for error irq
[ Upstream commit b38cd3b42fba66cc538edb9cf77e07881f43f8e2 ] For the possible failure of the platform_get_irq(), the returned irq could be error number and will finally cause the failure of the request_irq(). Consider that platform_get_irq() can now in certain cases return -EPROBE_DEFER, and the consequences of letting request_irq() effectively convert that into -EINVAL, even at probe time rather than later on. So it might be better to check just now. Fixes: 0395ffc1ee05 ("Bluetooth: hci_bcm: Add PM for BCM devices") Signed-off-by: Jiasheng Jiang <jiasheng@iscas.ac.cn> Signed-off-by: Marcel Holtmann <marcel@holtmann.org> Signed-off-by: Sasha Levin <sashal@kernel.org>
-rw-r--r--drivers/bluetooth/hci_bcm.c7
1 files changed, 6 insertions, 1 deletions
diff --git a/drivers/bluetooth/hci_bcm.c b/drivers/bluetooth/hci_bcm.c
index 3e386f68faa0..1a298f13bcc8 100644
--- a/drivers/bluetooth/hci_bcm.c
+++ b/drivers/bluetooth/hci_bcm.c
@@ -1052,7 +1052,12 @@ static int bcm_probe(struct platform_device *pdev)
return -ENOMEM;
dev->dev = &pdev->dev;
- dev->irq = platform_get_irq(pdev, 0);
+
+ ret = platform_get_irq(pdev, 0);
+ if (ret < 0)
+ return ret;
+
+ dev->irq = ret;
if (has_acpi_companion(&pdev->dev)) {
ret = bcm_acpi_probe(dev);