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

Commit 2e647124 authored by Tomas Winkler's avatar Tomas Winkler Committed by Greg Kroah-Hartman
Browse files

mei: unregister watchdog from mei_stop function 



we need to unregister watchdog device both in suspend and remove
as the registration is recreated on reset

Signed-off-by: default avatarTomas Winkler <tomas.winkler@intel.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent cea6aec4

drivers/misc/mei/init.c

+3 −0
Original line number Diff line number Diff line
@@ -211,6 +211,9 @@ void mei_stop(struct mei_device *dev) 
	mutex_unlock(&dev->device_lock);



	flush_scheduled_work();



	mei_watchdog_unregister(dev);



}

drivers/misc/mei/pci-me.c

+0 −2
Original line number Diff line number Diff line
@@ -253,8 +253,6 @@ static void mei_remove(struct pci_dev *pdev) 


	mei_pdev = NULL;



	mei_watchdog_unregister(dev);



	/* disable interrupts */

	mei_disable_interrupts(dev);