Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b9b4d35b authored by qctecmdr's avatar qctecmdr Committed by Gerrit - the friendly Code Review server
Browse files

Merge "cnss2: Wlan is going into recovery mode due to pcie link down"

parents aaa533fb c72e4578
Loading
Loading
Loading
Loading
+5 −5
Original line number Diff line number Diff line
@@ -1421,7 +1421,6 @@ void cnss_schedule_recovery(struct device *dev,
{
	struct cnss_plat_data *plat_priv = cnss_bus_dev_to_plat_priv(dev);
	struct cnss_recovery_data *data;
	int gfp = GFP_KERNEL;

	if (!test_bit(CNSS_DEV_ERR_NOTIFY, &plat_priv->driver_state))
		cnss_bus_update_status(plat_priv, CNSS_FW_DOWN);
@@ -1432,10 +1431,11 @@ void cnss_schedule_recovery(struct device *dev,
		return;
	}

	if (in_interrupt() || irqs_disabled())
		gfp = GFP_ATOMIC;

	data = kzalloc(sizeof(*data), gfp);
	/* Allocating memory always with GFP_ATOMIC flag inside
	 * cnss_schedule_recovery(). Because there is a chance for
	 * this api to be invoked in atomic context on some platforms.
	 */
	data = kzalloc(sizeof(*data), GFP_ATOMIC);
	if (!data)
		return;