Commit 235406dc authored by Mauro Carvalho Chehab's avatar Mauro Carvalho Chehab
Browse files

media: saa7134: fix saa7134_initdev error handling logic 



Smatch reported an issue there:
	drivers/media/pci/saa7134/saa7134-core.c:1302 saa7134_initdev() warn: '&dev->devlist' not removed from list

But besides freeing the list, the media controller graph also
needs to be cleaned up on errors. Address those issues.

Signed-off-by: default avatarMauro Carvalho Chehab <mchehab+huawei@kernel.org>
parent 7f9197f1

drivers/media/pci/saa7134/saa7134-core.c

+4 −1
Original line number Diff line number Diff line
@@ -1277,14 +1277,17 @@ static int saa7134_initdev(struct pci_dev *pci_dev, 
	 */

#ifdef CONFIG_MEDIA_CONTROLLER

	err = media_device_register(dev->media_dev);

	if (err)

	if (err) {

		media_device_cleanup(dev->media_dev);

		goto err_unregister_video;

	}

#endif



	return 0;



err_unregister_video:

	saa7134_unregister_video(dev);

	list_del(&dev->devlist);

	saa7134_i2c_unregister(dev);

	free_irq(pci_dev->irq, dev);

err_iounmap: