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

Commit d9b82522 authored by Krzysztof Hałasa's avatar Krzysztof Hałasa Committed by Mauro Carvalho Chehab
Browse files

[media] SOLO6x10: Remove dead code 



solo_dev and pdev cannot be NULL here. It doesn't matter if we
initialized the PCI device or not.

Signed-off-by: default avatarKrzysztof Ha?asa <khalasa@piap.pl>
Signed-off-by: default avatarHans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@osg.samsung.com>
parent e1ceb25a

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

+2 −15
Original line number Diff line number Diff line
@@ -134,23 +134,11 @@ static irqreturn_t solo_isr(int irq, void *data) 


static void free_solo_dev(struct solo_dev *solo_dev)

{

	struct pci_dev *pdev;



	if (!solo_dev)

		return;

	struct pci_dev *pdev = solo_dev->pdev;



	if (solo_dev->dev.parent)

		device_unregister(&solo_dev->dev);



	pdev = solo_dev->pdev;



	/* If we never initialized the PCI device, then nothing else

	 * below here needs cleanup */

	if (!pdev) {

		kfree(solo_dev);

		return;

	}



	if (solo_dev->reg_base) {

		/* Bring down the sub-devices first */

		solo_g723_exit(solo_dev);
@@ -164,7 +152,6 @@ static void free_solo_dev(struct solo_dev *solo_dev) 


		/* Now cleanup the PCI device */

		solo_irq_off(solo_dev, ~0);

		if (pdev->irq)

		free_irq(pdev->irq, solo_dev);

		pci_iounmap(pdev, solo_dev->reg_base);

	}