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

Commit f931f4f3 authored by Alexander Usyskin's avatar Alexander Usyskin Committed by Greg Kroah-Hartman
Browse files

mei: print correct device state during unexpected reset 



Move the unexpected state print to the beginning of mei_reset,
thus printing right state.

Signed-off-by: default avatarAlexander Usyskin <alexander.usyskin@intel.com>
Signed-off-by: default avatarTomas Winkler <tomas.winkler@intel.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 4bff7208

drivers/misc/mei/init.c

+4 −4
Original line number Diff line number Diff line
@@ -147,6 +147,10 @@ void mei_reset(struct mei_device *dev, int interrupts_enabled) 
			dev->dev_state != MEI_DEV_POWER_DOWN &&

			dev->dev_state != MEI_DEV_POWER_UP);



	if (unexpected)

		dev_warn(&dev->pdev->dev, "unexpected reset: dev_state = %s\n",

			 mei_dev_state_str(dev->dev_state));



	ret = mei_hw_reset(dev, interrupts_enabled);

	if (ret) {

		dev_err(&dev->pdev->dev, "hw reset failed disabling the device\n");
@@ -185,10 +189,6 @@ void mei_reset(struct mei_device *dev, int interrupts_enabled) 
	dev->rd_msg_hdr = 0;

	dev->wd_pending = false;



	if (unexpected)

		dev_warn(&dev->pdev->dev, "unexpected reset: dev_state = %s\n",

			 mei_dev_state_str(dev->dev_state));



	if (!interrupts_enabled) {

		dev_dbg(&dev->pdev->dev, "intr not enabled end of reset\n");

		return;