From 064e5d06bed599c8113fc0163495837377f3c0ce Mon Sep 17 00:00:00 2001 From: Axel Lin Date: Thu, 14 Jun 2012 16:00:53 +0800 Subject: [PATCH] --- yaml --- r: 311255 b: refs/heads/master c: 8386a00f1443f676e8b614f654e2e324fdc0b3b3 h: refs/heads/master i: 311253: 2e5cb32b43c7a72dde2f5688356c31327dbd0126 311251: 74c600d854fe6e5dbaec7da2df50784fd2385cbb 311247: e55b8e63d319656fcdd53957f72b2dfe7b2dd995 v: v3 --- [refs] | 2 +- trunk/drivers/regulator/tps6524x-regulator.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index ad9a5455de26..e069200b815b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 6b57c0155cb78d15b0d93b2c7f66ad9536862476 +refs/heads/master: 8386a00f1443f676e8b614f654e2e324fdc0b3b3 diff --git a/trunk/drivers/regulator/tps6524x-regulator.c b/trunk/drivers/regulator/tps6524x-regulator.c index b88b3df82381..1b299aacf22f 100644 --- a/trunk/drivers/regulator/tps6524x-regulator.c +++ b/trunk/drivers/regulator/tps6524x-regulator.c @@ -482,7 +482,7 @@ static int get_voltage_sel(struct regulator_dev *rdev) info = &supply_info[rdev_get_id(rdev)]; if (info->flags & FIXED_VOLTAGE) - return info->fixed_voltage; + return 0; ret = read_field(hw, &info->voltage); if (ret < 0)