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

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

mei: call stop on failed char device register 



If registering of character device failed stop the device properly.

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 f862b6b2

drivers/misc/mei/pci-me.c

+3 −1
Original line number Diff line number Diff line
@@ -210,7 +210,7 @@ static int mei_me_probe(struct pci_dev *pdev, const struct pci_device_id *ent) 


	err = mei_register(dev, &pdev->dev);

	if (err)

		goto release_irq;

		goto stop;



	pci_set_drvdata(pdev, dev);
@@ -231,6 +231,8 @@ static int mei_me_probe(struct pci_dev *pdev, const struct pci_device_id *ent) 


	return 0;



stop:

	mei_stop(dev);

release_irq:

	mei_cancel_work(dev);

	mei_disable_interrupts(dev);

drivers/misc/mei/pci-txe.c

+3 −1
Original line number Diff line number Diff line
@@ -154,7 +154,7 @@ static int mei_txe_probe(struct pci_dev *pdev, const struct pci_device_id *ent) 


	err = mei_register(dev, &pdev->dev);

	if (err)

		goto release_irq;

		goto stop;



	pci_set_drvdata(pdev, dev);
@@ -170,6 +170,8 @@ static int mei_txe_probe(struct pci_dev *pdev, const struct pci_device_id *ent) 


	return 0;



stop:

	mei_stop(dev);

release_irq:



	mei_cancel_work(dev);