X-Git-Url: http://git.droids-corp.org/?a=blobdiff_plain;f=drivers%2Fnet%2Ffailsafe%2Ffailsafe_intr.c;h=1c2cb71c412db2387e821c1ad5d75215bd3a0f2e;hb=38f7efaaf5ac7894bfd852b812e6ba3258ceffb4;hp=f6ff04dc89ac326c8c52660b6653ae1690cf112a;hpb=709676bc9c60290ce2f22e2ddca0ac54b3015f1e;p=dpdk.git

diff --git a/drivers/net/failsafe/failsafe_intr.c b/drivers/net/failsafe/failsafe_intr.c
index f6ff04dc89..1c2cb71c41 100644
--- a/drivers/net/failsafe/failsafe_intr.c
+++ b/drivers/net/failsafe/failsafe_intr.c
@@ -1,5 +1,5 @@
 /* SPDX-License-Identifier: BSD-3-Clause
- * Copyright 2018 Mellanox Technologies, Ltd.
+ * Copyright 2018 Mellanox Technologies, Ltd
  */
 
 /**
@@ -372,7 +372,7 @@ void failsafe_rx_intr_uninstall_subdevice(struct sub_device *sdev)
 	for (qid = 0; qid < ETH(sdev)->data->nb_rx_queues; qid++) {
 		if (qid < fsdev->data->nb_rx_queues) {
 			fsrxq = fsdev->data->rx_queues[qid];
-			if (fsrxq->enable_events)
+			if (fsrxq != NULL && fsrxq->enable_events)
 				rte_eth_dev_rx_intr_disable(PORT_ID(sdev),
 							    qid);
 		}
@@ -523,7 +523,7 @@ failsafe_rx_intr_install(struct rte_eth_dev *dev)
 	const struct rte_intr_conf *const intr_conf =
 			&priv->dev->data->dev_conf.intr_conf;
 
-	if (intr_conf->rxq == 0)
+	if (intr_conf->rxq == 0 || dev->intr_handle != NULL)
 		return 0;
 	if (fs_rx_intr_vec_install(priv) < 0)
 		return -rte_errno;