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

Commit 6855036a authored by Tejun Heo's avatar Tejun Heo Committed by Bartlomiej Zolnierkiewicz
Browse files

ide: unregister idepnp driver on unload 



idepnp driver is registered as a pnp driver on ide init but doesn't
get unregistered on ide unload causing driver list corruption and
eventually oops.  Fix it.

Signed-off-by: default avatarTejun Heo <htejun@gmail.com>
Signed-off-by: default avatarBartlomiej Zolnierkiewicz <bzolnier@gmail.com>
parent 82ab1eec

drivers/ide/ide-pnp.c

+5 −0
Original line number Diff line number Diff line
@@ -73,3 +73,8 @@ void __init pnpide_init(void) 
{

	pnp_register_driver(&idepnp_driver);

}



void __exit pnpide_exit(void)

{

	pnp_unregister_driver(&idepnp_driver);

}

drivers/ide/ide.c

+5 −0
Original line number Diff line number Diff line
@@ -1782,6 +1782,7 @@ static int __init ide_setup(char *s) 
}



extern void pnpide_init(void);

extern void pnpide_exit(void);

extern void h8300_ide_init(void);



/*
@@ -2094,6 +2095,10 @@ void cleanup_module (void) 
	for (index = 0; index < MAX_HWIFS; ++index)

		ide_unregister(index);



#ifdef CONFIG_BLK_DEV_IDEPNP

	pnpide_exit();

#endif



#ifdef CONFIG_PROC_FS

	proc_ide_destroy();

#endif