diff --git a/[refs] b/[refs] index 9e831acf7400..895300b657f1 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 12a1d933a99e1a2901575390dceea3819f2a575a +refs/heads/master: d87b969d15a084503870da598c97278fb4877753 diff --git a/trunk/include/linux/regulator/driver.h b/trunk/include/linux/regulator/driver.h index 73c9cd6cda7d..31f2055eae28 100644 --- a/trunk/include/linux/regulator/driver.h +++ b/trunk/include/linux/regulator/driver.h @@ -37,7 +37,8 @@ enum regulator_status { * * @enable: Configure the regulator as enabled. * @disable: Configure the regulator as disabled. - * @is_enabled: Return 1 if the regulator is enabled, 0 otherwise. + * @is_enabled: Return 1 if the regulator is enabled, 0 if not. + * May also return negative errno. * * @set_voltage: Set the voltage for the regulator within the range specified. * The driver should select the voltage closest to min_uV.