intel_sst: fix unload bugs

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>

diff --git a/drivers/staging/intel_sst/intel_sst.c b/drivers/staging/intel_sst/intel_sst.c
index 2f21f42a8360c0854acd33b691d15e3e4fa1b8c1..c40e00a12d7c337bca0423276e0427ef62da8da8 100644 (file)
--- a/drivers/staging/intel_sst/intel_sst.c
+++ b/drivers/staging/intel_sst/intel_sst.c
@@ -371,7 +371,8 @@ free_mad_wq:
        destroy_workqueue(sst_drv_ctx->mad_wq);
 do_free_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;
 }
 
@@ -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->mad_wq);
        kfree(sst_drv_ctx);
-       pci_release_region(pci, 1);
-       pci_release_region(pci, 2);
-       pci_release_region(pci, 3);
-       pci_release_region(pci, 4);
-       pci_release_region(pci, 5);
+       sst_drv_ctx = NULL;
+       pci_release_regions(pci);
+       pci_disable_device(pci);
        pci_set_drvdata(pci, NULL);
 }
 
@@ -604,6 +603,7 @@ static void __exit intel_sst_exit(void)
        pci_unregister_driver(&driver);
 
        pr_debug("driver unloaded\n");
+       sst_drv_ctx = NULL;
        return;
 }