summaryrefslogtreecommitdiff
path: root/drivers/bluetooth/btintel.c
diff options
context:
space:
mode:
authorWolfram Sang <wsa+renesas@sang-engineering.com>2024-08-09 15:28:08 +0200
committerWolfram Sang <wsa+renesas@sang-engineering.com>2024-08-09 15:28:08 +0200
commit01a620d491592ead12eca039fe1c9e74908c35cf (patch)
tree15271737ef24a7375f01eb928595ea3ba13c13ad /drivers/bluetooth/btintel.c
parent74b0666f97f9455bc799405b7874df62fcb66bae (diff)
parent9ba48db9f77ce0001dbb882476fa46e092feb695 (diff)
downloadlinux-01a620d491592ead12eca039fe1c9e74908c35cf.tar.gz
linux-01a620d491592ead12eca039fe1c9e74908c35cf.tar.bz2
linux-01a620d491592ead12eca039fe1c9e74908c35cf.zip
Merge tag 'i2c-host-fixes-6.11-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/andi.shyti/linux into i2c/for-current
Two fixes on the Qualcomm GENI I2C controller are cleaning up the error exit patch in the runtime_resume() function. The first is disabling the clock, the second disables the icc on the way out.
Diffstat (limited to 'drivers/bluetooth/btintel.c')
-rw-r--r--drivers/bluetooth/btintel.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/bluetooth/btintel.c b/drivers/bluetooth/btintel.c
index e7a612504ab1..2ebc970e6573 100644
--- a/drivers/bluetooth/btintel.c
+++ b/drivers/bluetooth/btintel.c
@@ -3085,6 +3085,9 @@ static int btintel_setup_combined(struct hci_dev *hdev)
btintel_set_dsm_reset_method(hdev, &ver_tlv);
err = btintel_bootloader_setup_tlv(hdev, &ver_tlv);
+ if (err)
+ goto exit_error;
+
btintel_register_devcoredump_support(hdev);
btintel_print_fseq_info(hdev);
break;