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

Commit 65d5d01d authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "wil6210: Fix driver down flow"

parents f0605025 32530729

drivers/net/wireless/ath/wil6210/main.c

+2 −14
Original line number Diff line number Diff line
@@ -1031,10 +1031,10 @@ int wil_up(struct wil6210_priv *wil) 


int __wil_down(struct wil6210_priv *wil)

{

	int rc;



	WARN_ON(!mutex_is_locked(&wil->mutex));



	set_bit(wil_status_resetting, wil->status);



	if (wil->platform_ops.bus_request)

		wil->platform_ops.bus_request(wil->platform_handle, 0);
@@ -1056,18 +1056,6 @@ int __wil_down(struct wil6210_priv *wil) 
		wil->scan_request = NULL;

	}



	if (test_bit(wil_status_fwconnected, wil->status) ||

	    test_bit(wil_status_fwconnecting, wil->status)) {



		mutex_unlock(&wil->mutex);

		rc = wmi_call(wil, WMI_DISCONNECT_CMDID, NULL, 0,

			      WMI_DISCONNECT_EVENTID, NULL, 0,

			      WIL6210_DISCONNECT_TO_MS);

		mutex_lock(&wil->mutex);

		if (rc)

			wil_err(wil, "timeout waiting for disconnect\n");

	}



	wil_reset(wil, false);



	return 0;