diff --git a/[refs] b/[refs] index 893c08b75465..b62705536f1b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e2c98eaf928a2a0ecaca1db9aa5dc56a36699d9f +refs/heads/master: 03ffcf3d0838bd5e693cd4520becfb22577cf34d diff --git a/trunk/drivers/regulator/core.c b/trunk/drivers/regulator/core.c index 974276afd1f0..4b136f8cb99f 100644 --- a/trunk/drivers/regulator/core.c +++ b/trunk/drivers/regulator/core.c @@ -2894,7 +2894,7 @@ int regulator_mode_to_status(unsigned int mode) return REGULATOR_STATUS_NORMAL; case REGULATOR_MODE_IDLE: return REGULATOR_STATUS_IDLE; - case REGULATOR_STATUS_STANDBY: + case REGULATOR_MODE_STANDBY: return REGULATOR_STATUS_STANDBY; default: return 0;