Kaynağa Gözat

Merge 3a529ce131e8d17d7ceb88b7026c9dab7e6ec7be on remote branch

Change-Id: I3af4801e1705889cc4ca9dd0aeb7c6ae76020226
Linux Build Service Account 8 ay önce
ebeveyn
işleme
cac970f21e
2 değiştirilmiş dosya ile 3 ekleme ve 2 silme
  1. 1 1
      icnss2/main.c
  2. 2 1
      icnss2/qmi.c

+ 1 - 1
icnss2/main.c

@@ -282,7 +282,7 @@ int icnss_driver_event_post(struct icnss_priv *priv,
 		return -EINVAL;
 	}
 
-	if (in_interrupt() || irqs_disabled())
+	if (in_interrupt() || !preemptible() || rcu_preempt_depth())
 		gfp = GFP_ATOMIC;
 
 	event = kzalloc(sizeof(*event), gfp);

+ 2 - 1
icnss2/qmi.c

@@ -2806,7 +2806,8 @@ static int icnss_wlfw_wfc_call_status_send_sync
 	struct qmi_txn txn;
 	int ret = 0;
 
-	if (!test_bit(ICNSS_FW_READY, &priv->state)) {
+	if (!test_bit(ICNSS_FW_READY, &priv->state) ||
+	    !test_bit(ICNSS_MODE_ON, &priv->state)) {
 		icnss_pr_err("Drop IMS WFC indication as FW not initialized\n");
 		return -EINVAL;
 	}