tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

regulator: Merge up fixes

So we can base some new debugfs work on it.

Mark Brown b8cabec7 6c594a82

+9 -6
+2 -2
drivers/regulator/core.c
··· 5256 5256 } 5257 5257 5258 5258 rdev->debugfs = debugfs_create_dir(rname, debugfs_root); 5259 - if (!rdev->debugfs) { 5259 + if (IS_ERR(rdev->debugfs)) { 5260 5260 rdev_warn(rdev, "Failed to create debugfs directory\n"); 5261 5261 return; 5262 5262 } ··· 6178 6178 ret = class_register(&regulator_class); 6179 6179 6180 6180 debugfs_root = debugfs_create_dir("regulator", NULL); 6181 - if (!debugfs_root) 6181 + if (IS_ERR(debugfs_root)) 6182 6182 pr_warn("regulator: Failed to create debugfs directory\n"); 6183 6183 6184 6184 #ifdef CONFIG_DEBUG_FS
+5 -2
drivers/regulator/mt6359-regulator.c
··· 951 951 struct regulator_config config = {}; 952 952 struct regulator_dev *rdev; 953 953 struct mt6359_regulator_info *mt6359_info; 954 - int i, hw_ver; 954 + int i, hw_ver, ret; 955 955 956 - regmap_read(mt6397->regmap, MT6359P_HWCID, &hw_ver); 956 + ret = regmap_read(mt6397->regmap, MT6359P_HWCID, &hw_ver); 957 + if (ret) 958 + return ret; 959 + 957 960 if (hw_ver >= MT6359P_CHIP_VER) 958 961 mt6359_info = mt6359p_regulators; 959 962 else
+2 -2
drivers/regulator/pca9450-regulator.c
··· 264 264 .vsel_reg = PCA9450_REG_BUCK2OUT_DVS0, 265 265 .vsel_mask = BUCK2OUT_DVS0_MASK, 266 266 .enable_reg = PCA9450_REG_BUCK2CTRL, 267 - .enable_mask = BUCK1_ENMODE_MASK, 267 + .enable_mask = BUCK2_ENMODE_MASK, 268 268 .ramp_reg = PCA9450_REG_BUCK2CTRL, 269 269 .ramp_mask = BUCK2_RAMP_MASK, 270 270 .ramp_delay_table = pca9450_dvs_buck_ramp_table, ··· 502 502 .vsel_reg = PCA9450_REG_BUCK2OUT_DVS0, 503 503 .vsel_mask = BUCK2OUT_DVS0_MASK, 504 504 .enable_reg = PCA9450_REG_BUCK2CTRL, 505 - .enable_mask = BUCK1_ENMODE_MASK, 505 + .enable_mask = BUCK2_ENMODE_MASK, 506 506 .ramp_reg = PCA9450_REG_BUCK2CTRL, 507 507 .ramp_mask = BUCK2_RAMP_MASK, 508 508 .ramp_delay_table = pca9450_dvs_buck_ramp_table,