Commit ebf72ccf authored by Daeseok Youn's avatar Daeseok Youn Committed by Greg Kroah-Hartman

staging: dgap: introduce dgap_stop()

The dgap_init_module() need to unwind for cleanup variables properly.
Because dgap_init_module() calls dgap_cleanup_module() for freeing
variables but this function is possible to free variables
which are not allocated.
Signed-off-by: default avatarDaeseok Youn <daeseok.youn@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 5ba1b07a
...@@ -71,6 +71,7 @@ MODULE_DESCRIPTION("Driver for the Digi International EPCA PCI based product lin ...@@ -71,6 +71,7 @@ MODULE_DESCRIPTION("Driver for the Digi International EPCA PCI based product lin
MODULE_SUPPORTED_DEVICE("dgap"); MODULE_SUPPORTED_DEVICE("dgap");
static int dgap_start(void); static int dgap_start(void);
static void dgap_stop(void);
static void dgap_init_globals(void); static void dgap_init_globals(void);
static struct board_t *dgap_found_board(struct pci_dev *pdev, int id, static struct board_t *dgap_found_board(struct pci_dev *pdev, int id,
int boardnum); int boardnum);
...@@ -479,19 +480,20 @@ static int dgap_init_module(void) ...@@ -479,19 +480,20 @@ static int dgap_init_module(void)
rc = pci_register_driver(&dgap_driver); rc = pci_register_driver(&dgap_driver);
if (rc) if (rc)
goto err_cleanup; goto err_stop;
rc = dgap_create_driver_sysfiles(&dgap_driver); rc = dgap_create_driver_sysfiles(&dgap_driver);
if (rc) if (rc)
goto err_cleanup; goto err_unregister;
dgap_driver_state = DRIVER_READY; dgap_driver_state = DRIVER_READY;
return 0; return 0;
err_cleanup: err_unregister:
pci_unregister_driver(&dgap_driver);
dgap_cleanup_module(); err_stop:
dgap_stop();
return rc; return rc;
} }
...@@ -561,6 +563,21 @@ static int dgap_start(void) ...@@ -561,6 +563,21 @@ static int dgap_start(void)
return rc; return rc;
} }
static void dgap_stop(void)
{
unsigned long lock_flags;
spin_lock_irqsave(&dgap_poll_lock, lock_flags);
dgap_poll_stop = 1;
spin_unlock_irqrestore(&dgap_poll_lock, lock_flags);
del_timer_sync(&dgap_poll_timer);
device_destroy(dgap_class, MKDEV(DIGI_DGAP_MAJOR, 0));
class_destroy(dgap_class);
unregister_chrdev(DIGI_DGAP_MAJOR, "dgap");
}
static int dgap_init_one(struct pci_dev *pdev, const struct pci_device_id *ent) static int dgap_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
{ {
int rc; int rc;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment