From c3cb01d6f0cddfd0c3b49a483cf06c37f7e79c87 Mon Sep 17 00:00:00 2001 From: Sujeev Dias Date: Thu, 20 Apr 2017 21:47:50 -0700 Subject: [PATCH] msm: mhi_rmnet: clean channel resources only if allocated It's possible for MHI host to send sys error notification signal before sending channel enable notification. Attempt to cleanup resources only if netdev is allocated. CRs-Fixed: 2037971 Change-Id: I2bd1f10966a042c6f3372adff89572a5795e7daf Signed-off-by: Sujeev Dias --- drivers/net/ethernet/msm/msm_rmnet_mhi.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/drivers/net/ethernet/msm/msm_rmnet_mhi.c b/drivers/net/ethernet/msm/msm_rmnet_mhi.c index 015cb99d445b..60b7a64c2edb 100644 --- a/drivers/net/ethernet/msm/msm_rmnet_mhi.c +++ b/drivers/net/ethernet/msm/msm_rmnet_mhi.c @@ -983,14 +983,17 @@ static void rmnet_mhi_cb(struct mhi_cb_info *cb_info) if (cb_info->chan == rmnet_mhi_ptr->rx_channel) { rmnet_log(rmnet_mhi_ptr, MSG_INFO, "Receive MHI_DISABLE notification for rx path\n"); - rmnet_mhi_disable(rmnet_mhi_ptr); + if (rmnet_mhi_ptr->dev) + rmnet_mhi_disable(rmnet_mhi_ptr); } else { rmnet_log(rmnet_mhi_ptr, MSG_INFO, "Receive MHI_DISABLE notification for tx path\n"); rmnet_mhi_ptr->tx_enabled = 0; - rmnet_mhi_internal_clean_unmap_buffers - (rmnet_mhi_ptr->dev, &rmnet_mhi_ptr->tx_buffers, - DMA_TO_DEVICE); + if (rmnet_mhi_ptr->dev) + rmnet_mhi_internal_clean_unmap_buffers( + rmnet_mhi_ptr->dev, + &rmnet_mhi_ptr->tx_buffers, + DMA_TO_DEVICE); } /* Remove all votes disabling low power mode */