From b796ba640bf2365e309a8afc62f6032dea19c800 Mon Sep 17 00:00:00 2001 From: Philipp Zabel Date: Thu, 28 May 2009 21:00:03 +0200 Subject: [PATCH] --- yaml --- r: 149588 b: refs/heads/master c: c8f1e5025ca2fa8e6e037451f3d271e66745a19b h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/regulator/max1586.c | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 866b1875ad50..22564fad03aa 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b110a8fb242bc34e4b7686252899ce0fca956e2c +refs/heads/master: c8f1e5025ca2fa8e6e037451f3d271e66745a19b diff --git a/trunk/drivers/regulator/max1586.c b/trunk/drivers/regulator/max1586.c index 92799f40c864..2c082d3ef484 100644 --- a/trunk/drivers/regulator/max1586.c +++ b/trunk/drivers/regulator/max1586.c @@ -40,8 +40,8 @@ struct max1586_data { struct i2c_client *client; /* min/max V3 voltage */ - int min_uV; - int max_uV; + unsigned int min_uV; + unsigned int max_uV; struct regulator_dev *rdev[0]; }; @@ -199,8 +199,8 @@ static int max1586_pmic_probe(struct i2c_client *client, ret = -EINVAL; goto out_unmap; } - max1586->min_uV = MAX1586_V3_MIN_UV * pdata->v3_gain / 1000000; - max1586->max_uV = MAX1586_V3_MAX_UV * pdata->v3_gain / 1000000; + max1586->min_uV = MAX1586_V3_MIN_UV / 1000 * pdata->v3_gain / 1000; + max1586->max_uV = MAX1586_V3_MAX_UV / 1000 * pdata->v3_gain / 1000; rdev = max1586->rdev; for (i = 0; i < pdata->num_subdevs && i <= MAX1586_V6; i++) {