Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 154900b5 authored by qctecmdr's avatar qctecmdr Committed by Gerrit - the friendly Code Review server
Browse files

Merge "regulator: qcom_pm8008-regulator: correct chip-en chip variable type"

parents 9d88952d 9991ef65

drivers/regulator/qcom_pm8008-regulator.c

+3 −3
Original line number Diff line number Diff line
@@ -710,7 +710,7 @@ static int pm8008_regulator_probe(struct platform_device *pdev) 
/* PM8008 chip enable regulator callbacks */

static int pm8008_enable_regulator_enable(struct regulator_dev *rdev)

{

	struct pm8008_regulator *chip = rdev_get_drvdata(rdev);

	struct pm8008_chip *chip = rdev_get_drvdata(rdev);

	int rc;



	rc = pm8008_masked_write(chip->regmap, MISC_CHIP_ENABLE_REG,
@@ -726,7 +726,7 @@ static int pm8008_enable_regulator_enable(struct regulator_dev *rdev) 


static int pm8008_enable_regulator_disable(struct regulator_dev *rdev)

{

	struct pm8008_regulator *chip = rdev_get_drvdata(rdev);

	struct pm8008_chip *chip = rdev_get_drvdata(rdev);

	int rc;



	rc = pm8008_masked_write(chip->regmap, MISC_CHIP_ENABLE_REG,
@@ -742,7 +742,7 @@ static int pm8008_enable_regulator_disable(struct regulator_dev *rdev) 


static int pm8008_enable_regulator_is_enabled(struct regulator_dev *rdev)

{

	struct pm8008_regulator *chip = rdev_get_drvdata(rdev);

	struct pm8008_chip *chip = rdev_get_drvdata(rdev);

	int rc;

	u8 reg;