Skip to content

Commit

Permalink
ide: unregister idepnp driver on unload
Browse files Browse the repository at this point in the history
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: Tejun Heo <htejun@gmail.com>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
  • Loading branch information
Tejun Heo authored and Bartlomiej Zolnierkiewicz committed Jan 27, 2007
1 parent 82ab1ee commit 6855036
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 0 deletions.
5 changes: 5 additions & 0 deletions drivers/ide/ide-pnp.c
Original file line number Diff line number Diff line change
Expand Up @@ -73,3 +73,8 @@ void __init pnpide_init(void)
{
pnp_register_driver(&idepnp_driver);
}

void __exit pnpide_exit(void)
{
pnp_unregister_driver(&idepnp_driver);
}
5 changes: 5 additions & 0 deletions drivers/ide/ide.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);

/*
Expand Down Expand Up @@ -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
Expand Down

0 comments on commit 6855036

Please sign in to comment.