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

Commit c2608a11 authored by Rajesh Shah's avatar Rajesh Shah Committed by Greg Kroah-Hartman
Browse files

[PATCH] shpchp: fix oops at driver unload 



At unload time, the shpchp driver does not remove sysfs files
it had created in the driver's probe entry point. This patch
fixes this problem.

Signed-off-by: default avatarRajesh Shah <rajesh.shah@intel.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 7c8942f9

drivers/pci/hotplug/shpchp.h

+1 −0
Original line number Diff line number Diff line
@@ -173,6 +173,7 @@ extern void get_hp_params_from_firmware(struct pci_dev *dev, 
		struct hotplug_params *hpp);

extern int	shpchprm_get_physical_slot_number(struct controller *ctrl,

		u32 *sun, u8 busnum, u8 devnum);

extern void	shpchp_remove_ctrl_files(struct controller *ctrl);





/* Global variables */

drivers/pci/hotplug/shpchp_core.c

+1 −0
Original line number Diff line number Diff line
@@ -480,6 +480,7 @@ static void __exit unload_shpchpd(void) 
	ctrl = shpchp_ctrl_list;



	while (ctrl) {

		shpchp_remove_ctrl_files(ctrl);

		cleanup_slots(ctrl);



		kfree (ctrl->pci_bus);

drivers/pci/hotplug/shpchp_sysfs.c

+5 −0
Original line number Diff line number Diff line
@@ -89,3 +89,8 @@ void shpchp_create_ctrl_files (struct controller *ctrl) 
{

	device_create_file (&ctrl->pci_dev->dev, &dev_attr_ctrl);

}



void shpchp_remove_ctrl_files(struct controller *ctrl)

{

	device_remove_file(&ctrl->pci_dev->dev, &dev_attr_ctrl);

}