Merge "wil6210: fix wil->platform_ops.suspend failure handling" (a7f31ff8) · Commits · e / devices / android_kernel_sony_msm8998

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

+10 −13

Original line number	Original line	Diff line number	Diff line
	@@ -80,6 +80,8 @@ static int wil_resume_keep_radio_on(struct wil6210_priv *wil)
	wil_c(wil, RGF_USER_CLKS_CTL_0, BIT_USER_CLKS_RST_PWGD);		wil_c(wil, RGF_USER_CLKS_CTL_0, BIT_USER_CLKS_RST_PWGD);
	wil_unmask_irq(wil);		wil_unmask_irq(wil);

			wil6210_bus_request(wil, wil->bus_request_kbps_pre_suspend);

	/* Send WMI resume request to the device */		/* Send WMI resume request to the device */
	rc = wmi_resume(wil);		rc = wmi_resume(wil);
	if (rc) {		if (rc) {
	@@ -96,8 +98,6 @@ static int wil_resume_keep_radio_on(struct wil6210_priv *wil)
	}		}
	}		}

	wil6210_bus_request(wil, wil->bus_request_kbps_pre_suspend);

	out:		out:
	if (rc)		if (rc)
	set_bit(wil_status_suspended, wil->status);		set_bit(wil_status_suspended, wil->status);
	@@ -175,38 +175,35 @@ static int wil_suspend_keep_radio_on(struct wil6210_priv *wil)
	/* Disable device reset on PERST */		/* Disable device reset on PERST */
	wil_s(wil, RGF_USER_CLKS_CTL_0, BIT_USER_CLKS_RST_PWGD);		wil_s(wil, RGF_USER_CLKS_CTL_0, BIT_USER_CLKS_RST_PWGD);

	/* Save the current bus request to return to the same in resume */
	wil->bus_request_kbps_pre_suspend = wil->bus_request_kbps;
	wil6210_bus_request(wil, 0);

	if (wil->platform_ops.suspend) {		if (wil->platform_ops.suspend) {
	rc = wil->platform_ops.suspend(wil->platform_handle, true);		rc = wil->platform_ops.suspend(wil->platform_handle, true);
	if (rc) {		if (rc) {
	wil_err(wil, "platform device failed to suspend (%d)\n",		wil_err(wil, "platform device failed to suspend (%d)\n",
	rc);		rc);
	wil->suspend_stats.failed_suspends++;		wil->suspend_stats.failed_suspends++;
	clear_bit(wil_status_suspending, wil->status);		wil_c(wil, RGF_USER_CLKS_CTL_0, BIT_USER_CLKS_RST_PWGD);
	rc = wil_resume_keep_radio_on(wil);		wil_unmask_irq(wil);
	/* if resume succeeded, reject the suspend */		goto resume_after_fail;
	if (!rc)
	rc = -EBUSY;
	goto out;
	}		}
	}		}

			/* Save the current bus request to return to the same in resume */
			wil->bus_request_kbps_pre_suspend = wil->bus_request_kbps;
			wil6210_bus_request(wil, 0);

	set_bit(wil_status_suspended, wil->status);		set_bit(wil_status_suspended, wil->status);
	clear_bit(wil_status_suspending, wil->status);		clear_bit(wil_status_suspending, wil->status);

	return rc;		return rc;

	resume_after_fail:		resume_after_fail:
			set_bit(wil_status_resuming, wil->status);
	clear_bit(wil_status_suspending, wil->status);		clear_bit(wil_status_suspending, wil->status);
	rc = wmi_resume(wil);		rc = wmi_resume(wil);
	/* if resume succeeded, reject the suspend */		/* if resume succeeded, reject the suspend */
	if (!rc)		if (!rc)
	rc = -EBUSY;		rc = -EBUSY;

	out:
	return rc;		return rc;

	reject_suspend:		reject_suspend: