evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

intel_sst: fix unload bugs

Browse source 
The current driver remove was erroneous and causes
errors when unloading or loading second time

This patch fixes both of these issues

Signed-off-by: Vinod Koul <vinod.koul@intel.com>
Signed-off-by: Ramesh Babu K V <ramesh.babu@intel.com>
Signed-off-by: Alan Cox <alan@linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
Vinod Koul 2011-05-03 17:32:13 +01:00 • committed by Greg Kroah-Hartman
parent b06a584c21
commit 1bea302c2f
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
drivers/staging/intel_sst/intel_sst.c
View file

@ -371,7 +371,8 @@ free_mad_wq:
destroy_workqueue(sst_drv_ctx->mad_wq); destroy_workqueue(sst_drv_ctx->mad_wq);
do_free_drv_ctx: do_free_drv_ctx:
kfree(sst_drv_ctx); kfree(sst_drv_ctx);
pr_err("Probe failed with 0x%x\n", ret); sst_drv_ctx = NULL;
pr_err("Probe failed with %d\n", ret);
return ret; return ret;
} }
@ -407,11 +408,9 @@ static void __devexit intel_sst_remove(struct pci_dev *pci)
destroy_workqueue(sst_drv_ctx->post_msg_wq); destroy_workqueue(sst_drv_ctx->post_msg_wq);
destroy_workqueue(sst_drv_ctx->mad_wq); destroy_workqueue(sst_drv_ctx->mad_wq);
kfree(sst_drv_ctx); kfree(sst_drv_ctx);
pci_release_region(pci, 1); sst_drv_ctx = NULL;
pci_release_region(pci, 2); pci_release_regions(pci);
pci_release_region(pci, 3); pci_disable_device(pci);
pci_release_region(pci, 4);
pci_release_region(pci, 5);
pci_set_drvdata(pci, NULL); pci_set_drvdata(pci, NULL);
} }
@ -604,6 +603,7 @@ static void __exit intel_sst_exit(void)
pci_unregister_driver(&driver); pci_unregister_driver(&driver);
pr_debug("driver unloaded\n"); pr_debug("driver unloaded\n");
sst_drv_ctx = NULL;
return; return;
} }