Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge tag 'regulator-fix-v6.5-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator
Pull regulator fixes from Mark Brown:
"A couple of small fixes for the the mt6358 driver, fixing error
reporting and a bootstrapping issue"
* tag 'regulator-fix-v6.5-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator:
regulator: mt6358: Fix incorrect VCN33 sync error message
regulator: mt6358: Sync VCN33_* enable status after checking ID
+5
-5
+5
-5
drivers/regulator/mt6358-regulator.c
+5
-5
drivers/regulator/mt6358-regulator.c
···
661
661
/* Disable VCN33_WIFI */
662
662
ret = regmap_update_bits(mt6397->regmap, MT6358_LDO_VCN33_CON0_1, BIT(0), 0);
663
663
if (ret) {
664
-
dev_err(dev, "Failed to disable VCN33_BT\n");
664
+
dev_err(dev, "Failed to disable VCN33_WIFI\n");
665
665
return ret;
666
666
}
667
667
···
676
676
const struct mt6358_regulator_info *mt6358_info;
677
677
int i, max_regulator, ret;
678
678
679
-
ret = mt6358_sync_vcn33_setting(&pdev->dev);
680
-
if (ret)
681
-
return ret;
682
-
683
679
if (mt6397->chip_id == MT6366_CHIP_ID) {
684
680
max_regulator = MT6366_MAX_REGULATOR;
685
681
mt6358_info = mt6366_regulators;
···
683
687
max_regulator = MT6358_MAX_REGULATOR;
684
688
mt6358_info = mt6358_regulators;
685
689
}
690
+
691
+
ret = mt6358_sync_vcn33_setting(&pdev->dev);
692
+
if (ret)
693
+
return ret;
686
694
687
695
for (i = 0; i < max_regulator; i++) {
688
696
config.dev = &pdev->dev;