From a271040b162cd4c91f07f75b7d978c086cd138f7 Mon Sep 17 00:00:00 2001 From: Axel Lin Date: Sat, 24 Nov 2012 00:50:52 +0800 Subject: [PATCH] --- yaml --- r: 343127 b: refs/heads/master c: 16ed9f0701d2bb06d96754ba1d3edbf9aa5faeef h: refs/heads/master i: 343125: 9b7712637c0336ceb7b5c1cfb742ae315d35e56b 343123: 82ee6ed49e7f8967cf2d238c9f14667ea8c30494 343119: 89166dfa36adf67a3b28edc89b2cbacc1f53a94d v: v3 --- [refs] | 2 +- trunk/drivers/regulator/as3711-regulator.c | 9 +++------ 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/[refs] b/[refs] index 2e9a84b81b4c..eee40df44308 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f1e64f90269c197a0619535917210543c0112fcc +refs/heads/master: 16ed9f0701d2bb06d96754ba1d3edbf9aa5faeef diff --git a/trunk/drivers/regulator/as3711-regulator.c b/trunk/drivers/regulator/as3711-regulator.c index 81578bf7e352..5e813b9059e7 100644 --- a/trunk/drivers/regulator/as3711-regulator.c +++ b/trunk/drivers/regulator/as3711-regulator.c @@ -69,17 +69,14 @@ static int as3711_list_voltage_dldo(struct regulator_dev *rdev, static int as3711_bound_check(struct regulator_dev *rdev, int *min_uV, int *max_uV) { - struct as3711_regulator_info *info = container_of(rdev->desc, - struct as3711_regulator_info, desc); - struct as3711_regulator *reg = rdev->reg_data; - - WARN_ON(reg->reg_info != info); + struct as3711_regulator *reg = rdev_get_drvdata(rdev); + struct as3711_regulator_info *info = reg->reg_info; dev_dbg(&rdev->dev, "%s(), %d, %d, %d\n", __func__, *min_uV, rdev->desc->min_uV, info->max_uV); if (*max_uV < *min_uV || - *min_uV >= info->max_uV || rdev->desc->min_uV >= *max_uV) + *min_uV > info->max_uV || rdev->desc->min_uV > *max_uV) return -EINVAL; if (rdev->desc->n_voltages == 1)