shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-09 12:17:12 +09:00
Code Issues Packages Projects Releases Wiki Activity

rk3168:act8846:modify some error

Browse Source
This commit is contained in:
张晴
2012-12-25 16:40:10 +08:00
parent 889b469633
commit a8f3e82f3d
2 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
drivers/regulator/act8846.c
View File

@@ -153,6 +153,8 @@ const static int ldo_voltage_map[] = {
static int act8846_ldo_list_voltage(struct regulator_dev *dev, unsigned index)
{
if (index >= ARRAY_SIZE(ldo_voltage_map))
return -EINVAL;
return 1000 * ldo_voltage_map[index];
}
static int act8846_ldo_is_enabled(struct regulator_dev *dev)
@@ -274,6 +276,8 @@ static struct regulator_ops act8846_ldo_ops = {
static int act8846_dcdc_list_voltage(struct regulator_dev *dev, unsigned index)
{
if (index >= ARRAY_SIZE(buck_voltage_map))
return -EINVAL;
return 1000 * buck_voltage_map[index];
}
static int act8846_dcdc_is_enabled(struct regulator_dev *dev)
@@ -662,7 +666,6 @@ static int __devinit act8846_i2c_probe(struct i2c_client *i2c, const struct i2c_
struct act8846 *act8846;
struct act8846_platform_data *pdata = i2c->dev.platform_data;
int ret;
msleep(1000);
act8846 = kzalloc(sizeof(struct act8846), GFP_KERNEL);
if (act8846 == NULL) {
ret = -ENOMEM;

4
drivers/regulator/act8931.c
View File

@@ -145,6 +145,8 @@ const static int ldo_voltage_map[] = {
static int act8931_ldo_list_voltage(struct regulator_dev *dev, unsigned index)
{
if (index >= ARRAY_SIZE(ldo_voltage_map))
return -EINVAL;
return 1000 * ldo_voltage_map[index];
}
static int act8931_ldo_is_enabled(struct regulator_dev *dev)
@@ -263,6 +265,8 @@ static struct regulator_ops act8931_ldo_ops = {
static int act8931_dcdc_list_voltage(struct regulator_dev *dev, unsigned index)
{
if (index >= ARRAY_SIZE(buck_voltage_map))
return -EINVAL;
return 1000 * buck_voltage_map[index];
}
static int act8931_dcdc_is_enabled(struct regulator_dev *dev)