---

yaml --- r: 249422 b: refs/heads/master c: 1bea302 h: refs/heads/master v: v3
git-mirror · May 10, 2011 · 591e4f2 · 591e4f2
1 parent 1d1c377
commit 591e4f2
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b06a584c219f4cda1ff22d4988bc8ea19589a2c8
+refs/heads/master: 1bea302c2fe28405cf10f60599c904dfa0bad3fe
diff --git a/trunk/drivers/staging/intel_sst/intel_sst.c b/trunk/drivers/staging/intel_sst/intel_sst.c
@@ -371,7 +371,8 @@ static int __devinit intel_sst_probe(struct pci_dev *pci,
 	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;
 }