evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "ASoC: wcd9xxx: check gpio pinctrl state in wcd9xxx_reset"

Browse source
This commit is contained in:
Linux Build Service Account 2017-01-31 04:42:28 -08:00 • committed by Gerrit - the friendly Code Review server
commit 7949ac69d2
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
drivers/mfd/wcd9xxx-utils.c
View file

@ -1,4 +1,4 @@
/* Copyright (c) 2016, The Linux Foundation. All rights reserved.
/* Copyright (c) 2016-2017, The Linux Foundation. All rights reserved.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License version 2 and
@ -669,7 +669,7 @@ int wcd9xxx_reset(struct device *dev)
return -EINVAL;
}
value = msm_cdc_get_gpio_state(wcd9xxx->wcd_rst_np);
value = msm_cdc_pinctrl_get_state(wcd9xxx->wcd_rst_np);
if (value > 0) {
wcd9xxx->avoid_cdc_rstlow = 1;
return 0;