aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAurelien Jacquiot2015-09-24 09:16:45 -0500
committerAurelien Jacquiot2015-09-24 09:40:47 -0500
commit9a50607e6933877928ed692bafa3b9bd92ddd5d1 (patch)
tree444634629d4d7c99152265754a55ca0358899c68
parentc375218d99d3f24c3b5b704cc0d3c1c238a5996a (diff)
downloadlinux-rio-dev-dio.tar.gz
linux-rio-dev-dio.tar.xz
linux-rio-dev-dio.zip
rapidio: keystone: do not reset controller if ports are being registeredrio-dev-dio
When using a global controller reset instead of an error recovery, do not reset the controller if ports are being registered by initialization process. It may occur if the port error interrupt is received too early. Signed-off-by: Aurelien Jacquiot <a-jacquiot@ti.com>
-rw-r--r--drivers/rapidio/devices/keystone_rio.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/rapidio/devices/keystone_rio.c b/drivers/rapidio/devices/keystone_rio.c
index 376fb8e436d..e6f92fe247c 100644
--- a/drivers/rapidio/devices/keystone_rio.c
+++ b/drivers/rapidio/devices/keystone_rio.c
@@ -156,7 +156,8 @@ static void keystone_rio_port_error(struct keystone_rio_data *krio_priv,
156 keystone_rio_send_reset(krio_priv, port); 156 keystone_rio_send_reset(krio_priv, port);
157 157
158 /* Reset local ports (all) */ 158 /* Reset local ports (all) */
159 keystone_rio_reset_symbol_handler(krio_priv); 159 if (!krio_priv->ports_registering)
160 keystone_rio_reset_symbol_handler(krio_priv);
160 } 161 }
161} 162}
162 163