Commit caa2a61a authored by Takashi Iwai's avatar Takashi Iwai
Browse files

ALSA: x86: Remove superfluous check at resume 



The had_get_hwstate() is identical with drv_status==DISCONECTED, which
was already checked before the call.  And, returning an error at
resume is simply bad.  That is, we should just kill this check.

Also, spewing an error at resume for drv_status!=SUSPENDED is also
annoying, as this is the normal case when the suspend was called
without the monitor connection.  Make it debug, too.

Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent 99b2ab9d

sound/x86/intel_hdmi_audio.c

+1 −9
Original line number Diff line number Diff line
@@ -1454,7 +1454,6 @@ static int hdmi_lpe_audio_suspend(struct platform_device *pdev, 
		return -EAGAIN;

	}





	spin_lock_irqsave(&intelhaddata->had_spinlock, flag_irqs);

	if (intelhaddata->drv_status == HAD_DRV_DISCONNECTED) {

		spin_unlock_irqrestore(&intelhaddata->had_spinlock, flag_irqs);
@@ -1500,17 +1499,10 @@ static int hdmi_lpe_audio_resume(struct platform_device *pdev) 


	if (intelhaddata->drv_status != HAD_DRV_SUSPENDED) {

		spin_unlock_irqrestore(&intelhaddata->had_spinlock, flag_irqs);

		dev_err(intelhaddata->dev, "had is not in suspended state\n");

		dev_dbg(intelhaddata->dev, "had is not in suspended state\n");

		return 0;

	}



	if (had_get_hwstate(intelhaddata)) {

		spin_unlock_irqrestore(&intelhaddata->had_spinlock, flag_irqs);

		dev_err(intelhaddata->dev,

			"Failed to resume. Device not accessible\n");

		return -ENODEV;

	}



	intelhaddata->drv_status = HAD_DRV_CONNECTED;

	dev_dbg(intelhaddata->dev,

		"%s @ %d:DEBUG PLUG/UNPLUG : HAD_DRV_DISCONNECTED\n",

CRA Git | Maintained and supported by SUSTech CRA and CCSE