Commit e9cb77d0 authored by Mark Brown's avatar Mark Brown
Browse files

Merge remote-tracking branch 'regulator/fix/bypass' into regulator-linus

parents 099cba20 dd1a571d
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -460,7 +460,7 @@ int regulator_get_bypass_regmap(struct regulator_dev *rdev, bool *enable)
	if (ret != 0)
		return ret;

	*enable = val & rdev->desc->bypass_mask;
	*enable = (val & rdev->desc->bypass_mask) == rdev->desc->bypass_val_on;

	return 0;
}