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

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

Merge "ASoC: bg: remove workqueue status check"

parents 7281b8d5 3f016bc3

sound/soc/codecs/bg_codec.c

+5 −10
Original line number Diff line number Diff line
@@ -369,7 +369,6 @@ static int _bg_codec_hw_params(struct bg_cdc_priv *bg_cdc) 
	struct pktzr_cmd_rsp rsp;

	int ret = 0;



	if (delayed_work_pending(&bg_cdc->bg_cdc_cal_init_work))

	cancel_delayed_work_sync(&bg_cdc->bg_cdc_cal_init_work);

	mutex_lock(&bg_cdc->bg_cdc_lock);

	if (!bg_cdc->bg_dev_up) {
@@ -1124,9 +1123,7 @@ static int bg_cdc_codec_remove(struct snd_soc_codec *codec) 
	pr_debug("In func %s\n", __func__);

	pktzr_deinit();



	if (delayed_work_pending(&bg_cdc->bg_cdc_pktzr_init_work))

	cancel_delayed_work_sync(&bg_cdc->bg_cdc_pktzr_init_work);

	if (delayed_work_pending(&bg_cdc->bg_cdc_cal_init_work))

	cancel_delayed_work_sync(&bg_cdc->bg_cdc_cal_init_work);

	if (adsp_state_notifier)

		subsys_notif_unregister_notifier(adsp_state_notifier,
@@ -1146,9 +1143,7 @@ static int bg_cdc_pm_suspend(struct bg_cdc_priv *bg_cdc) 
		pr_debug("audio session in progress don't devote\n");

		return 0;

	}

	if (delayed_work_pending(&bg_cdc->bg_cdc_pktzr_init_work))

	cancel_delayed_work_sync(&bg_cdc->bg_cdc_pktzr_init_work);

	if (delayed_work_pending(&bg_cdc->bg_cdc_cal_init_work))

	cancel_delayed_work_sync(&bg_cdc->bg_cdc_cal_init_work);

	mutex_lock(&bg_cdc->bg_cdc_lock);

	if (bg_cdc->bg_cal_updated) {