Merge branches 'x86-fixes-for-linus' and 'x86-uv-for-linus' of git://git.kernel.org...

[pandora-kernel.git] / drivers / regulator / max8952.c

diff --git a/drivers/regulator/max8952.c b/drivers/regulator/max8952.c
index 7d6aacf..0d5dda4 100644 (file)
--- a/drivers/regulator/max8952.c
+++ b/drivers/regulator/max8952.c
@@ -136,7 +136,7 @@ static int max8952_set_voltage(struct regulator_dev *rdev,
                                int min_uV, int max_uV)
 {
        struct max8952_data *max8952 = rdev_get_drvdata(rdev);
-       u8 vid = -1, i;
+       s8 vid = -1, i;
 
        if (!gpio_is_valid(max8952->pdata->gpio_vid0) ||
                        !gpio_is_valid(max8952->pdata->gpio_vid0)) {