diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2010-01-07 11:16:14 -0500 |
|---|---|---|
| committer | Samuel Ortiz <sameo@linux.intel.com> | 2010-01-18 06:30:28 -0500 |
| commit | 8e6ba2dfa2d6c4691a83a63e211990a8bd7b788b (patch) | |
| tree | 2580d1bf430464488d2017639f967af913f69c21 | |
| parent | 64e8867ba8098b69889c1af94997a5ba2348fb26 (diff) | |
mfd: WM835x GPIO direction register is not locked
No need to set the security key when writing to it.
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Cc: stable@kernel.org
Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
| -rw-r--r-- | drivers/mfd/wm8350-core.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/mfd/wm8350-core.c b/drivers/mfd/wm8350-core.c index 8485a701806..9a970bd6877 100644 --- a/drivers/mfd/wm8350-core.c +++ b/drivers/mfd/wm8350-core.c | |||
| @@ -134,8 +134,7 @@ static inline int is_reg_locked(struct wm8350 *wm8350, u8 reg) | |||
| 134 | wm8350->reg_cache[WM8350_SECURITY] == WM8350_UNLOCK_KEY) | 134 | wm8350->reg_cache[WM8350_SECURITY] == WM8350_UNLOCK_KEY) |
| 135 | return 0; | 135 | return 0; |
| 136 | 136 | ||
| 137 | if ((reg == WM8350_GPIO_CONFIGURATION_I_O) || | 137 | if ((reg >= WM8350_GPIO_FUNCTION_SELECT_1 && |
| 138 | (reg >= WM8350_GPIO_FUNCTION_SELECT_1 && | ||
| 139 | reg <= WM8350_GPIO_FUNCTION_SELECT_4) || | 138 | reg <= WM8350_GPIO_FUNCTION_SELECT_4) || |
| 140 | (reg >= WM8350_BATTERY_CHARGER_CONTROL_1 && | 139 | (reg >= WM8350_BATTERY_CHARGER_CONTROL_1 && |
| 141 | reg <= WM8350_BATTERY_CHARGER_CONTROL_3)) | 140 | reg <= WM8350_BATTERY_CHARGER_CONTROL_3)) |