Commit 825fc494 authored by Martin Tůma's avatar Martin Tůma Committed by Hans Verkuil
Browse files

media: mgb4: Fix double debugfs remove 



Fixes an error where debugfs_remove_recursive() is called first on a parent
directory and then again on a child which causes a kernel panic.

Signed-off-by: default avatarMartin Tůma <martin.tuma@digiteqautomotive.com>
Signed-off-by: default avatarHans Verkuil <hverkuil-cisco@xs4all.nl>
Fixes: 0ab13674 ("media: pci: mgb4: Added Digiteq Automotive MGB4 driver")
Cc: <stable@vger.kernel.org>
[hverkuil: added Fixes/Cc tags]
parent 1613e604

drivers/media/pci/mgb4/mgb4_core.c

+4 −3
Original line number Diff line number Diff line
@@ -642,9 +642,6 @@ static void mgb4_remove(struct pci_dev *pdev) 
	struct mgb4_dev *mgbdev = pci_get_drvdata(pdev);

	int i;



#ifdef CONFIG_DEBUG_FS

	debugfs_remove_recursive(mgbdev->debugfs);

#endif

#if IS_REACHABLE(CONFIG_HWMON)

	hwmon_device_unregister(mgbdev->hwmon_dev);

#endif
@@ -659,6 +656,10 @@ static void mgb4_remove(struct pci_dev *pdev) 
		if (mgbdev->vin[i])

			mgb4_vin_free(mgbdev->vin[i]);



#ifdef CONFIG_DEBUG_FS

	debugfs_remove_recursive(mgbdev->debugfs);

#endif



	device_remove_groups(&mgbdev->pdev->dev, mgb4_pci_groups);

	free_spi(mgbdev);

	free_i2c(mgbdev);