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

277b1be9 · Mark Brown · fad01e86 · 112da5cb · 277b1be9
Commit 277b1be9 authored Jun 02, 2014 by Mark Brown
Show whitespace changes
Inline Side-by-side

Showing with 0 additions and 1 deletion

drivers/regulator/s2mpa01.c drivers/regulator/s2mpa01.c +0 -1

No files found.
--- a/drivers/regulator/s2mpa01.c
+++ b/drivers/regulator/s2mpa01.c
@@ -116,7 +116,6 @@ static int s2mpa01_set_ramp_delay(struct regulator_dev *rdev, int ramp_delay)
 			ramp_delay = s2mpa01->ramp_delay16;
 		ramp_shift = S2MPA01_BUCK16_RAMP_SHIFT;
-		ramp_reg = S2MPA01_REG_RAMP1;
 		break;
 	case S2MPA01_BUCK2:
 		enable_shift = S2MPA01_BUCK2_RAMP_EN_SHIFT;