diff options
| -rw-r--r-- | drivers/media/platform/tegra/dw9718.c | 5 | ||||
| -rw-r--r-- | include/media/dw9718.h | 17 |
2 files changed, 15 insertions, 7 deletions
diff --git a/drivers/media/platform/tegra/dw9718.c b/drivers/media/platform/tegra/dw9718.c index 1bf511ef214f..6797e0166551 100644 --- a/drivers/media/platform/tegra/dw9718.c +++ b/drivers/media/platform/tegra/dw9718.c @@ -331,8 +331,12 @@ static int dw9718_power_put(struct dw9718_power_rail *pw) if (likely(pw->vdd_i2c)) regulator_put(pw->vdd_i2c); + if (likely(pw->vana)) + regulator_put(pw->vana); + pw->vdd = NULL; pw->vdd_i2c = NULL; + pw->vana = NULL; return 0; } @@ -363,6 +367,7 @@ static int dw9718_power_get(struct dw9718_info *info) dw9718_regulator_get(info, &pw->vdd, "vdd"); dw9718_regulator_get(info, &pw->vdd_i2c, "vdd_i2c"); + dw9718_regulator_get(info, &pw->vana, "vana"); return 0; } diff --git a/include/media/dw9718.h b/include/media/dw9718.h index 9fe2f45c24cc..82dbbada02fa 100644 --- a/include/media/dw9718.h +++ b/include/media/dw9718.h @@ -1,17 +1,19 @@ /* - * Copyright (C) 2010-2013, NVIDIA Corporation. All rights reserved. + * Copyright (c) 2010-2014, NVIDIA CORPORATION. All rights reserved. * - * This program is free software; you can redistribute it and/or modify it - * under the terms and conditions of the GNU General Public License, - * version 2, as published by the Free Software Foundation. + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. * - * This program is distributed in the hope it will be useful, but WITHOUT + * This program is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for * more details. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * You should have received a copy of the GNU General Public License along + * with this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ #ifndef __DW9718_H__ @@ -24,6 +26,7 @@ struct dw9718_power_rail { struct regulator *vdd; struct regulator *vdd_i2c; + struct regulator *vana; }; struct dw9718_platform_data { |