summaryrefslogtreecommitdiffstats
path: root/Revert-pinctrl-qcom-use-restart_notifier-mechanism-f.patch
diff options
context:
space:
mode:
authorJosh Boyer <jwboyer@fedoraproject.org>2014-10-10 09:14:00 -0400
committerJosh Boyer <jwboyer@fedoraproject.org>2014-10-10 09:14:00 -0400
commit35ac9a875942baf213b210ef2954da4fa0f3b463 (patch)
treee2ed984e81584a9a89cac4ba17a8e7ee65f690aa /Revert-pinctrl-qcom-use-restart_notifier-mechanism-f.patch
parentc01ddf0dcd7e42362ea1be6489b7da7500032c24 (diff)
downloadkernel-35ac9a875942baf213b210ef2954da4fa0f3b463.tar.gz
kernel-35ac9a875942baf213b210ef2954da4fa0f3b463.tar.xz
kernel-35ac9a875942baf213b210ef2954da4fa0f3b463.zip
Linux v3.17-6136-gc798360cd143
Diffstat (limited to 'Revert-pinctrl-qcom-use-restart_notifier-mechanism-f.patch')
-rw-r--r--Revert-pinctrl-qcom-use-restart_notifier-mechanism-f.patch6
1 files changed, 3 insertions, 3 deletions
diff --git a/Revert-pinctrl-qcom-use-restart_notifier-mechanism-f.patch b/Revert-pinctrl-qcom-use-restart_notifier-mechanism-f.patch
index 8ac29de0e..643894e56 100644
--- a/Revert-pinctrl-qcom-use-restart_notifier-mechanism-f.patch
+++ b/Revert-pinctrl-qcom-use-restart_notifier-mechanism-f.patch
@@ -9,7 +9,7 @@ This reverts commit cf1fc187628913070c3e418ce0e205732435aa2f.
1 file changed, 13 insertions(+), 18 deletions(-)
diff --git a/drivers/pinctrl/qcom/pinctrl-msm.c b/drivers/pinctrl/qcom/pinctrl-msm.c
-index d30dddd21323..d5ed1272b928 100644
+index e730935fa457..c57ca10bed20 100644
--- a/drivers/pinctrl/qcom/pinctrl-msm.c
+++ b/drivers/pinctrl/qcom/pinctrl-msm.c
@@ -27,7 +27,8 @@
@@ -79,8 +79,8 @@ index d30dddd21323..d5ed1272b928 100644
int msm_pinctrl_probe(struct platform_device *pdev,
const struct msm_pinctrl_soc_data *soc_data)
-@@ -946,8 +943,6 @@ int msm_pinctrl_remove(struct platform_device *pdev)
-
+@@ -940,8 +937,6 @@ int msm_pinctrl_remove(struct platform_device *pdev)
+ gpiochip_remove(&pctrl->chip);
pinctrl_unregister(pctrl->pctrl);
- unregister_restart_handler(&pctrl->restart_nb);