---

yaml --- r: 311134 b: refs/heads/master c: 169dc38 h: refs/heads/master v: v3
git-mirror · Jun 13, 2012 · 46a9d05 · 46a9d05
1 parent 4354805
commit 46a9d05
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1e69d64a28cf3cabd095ada3a49f081c97f997dd
+refs/heads/master: 169dc388685f8a1c1e09546882a114ac850a5d6b
diff --git a/trunk/drivers/misc/mei/main.c b/trunk/drivers/misc/mei/main.c
@@ -992,7 +992,7 @@ static int __devinit mei_probe(struct pci_dev *pdev,
 	if (err) {
 		dev_err(&pdev->dev, "request_threaded_irq failure. irq = %d\n",
 		       pdev->irq);
-		goto unmap_memory;
+		goto disable_msi;
 	}
 	INIT_DELAYED_WORK(&dev->timer_work, mei_timer);
 	if (mei_hw_init(dev)) {
@@ -1023,8 +1023,8 @@ static int __devinit mei_probe(struct pci_dev *pdev,
 	mei_disable_interrupts(dev);
 	flush_scheduled_work();
 	free_irq(pdev->irq, dev);
+disable_msi:
 	pci_disable_msi(pdev);
-unmap_memory:
 	pci_iounmap(pdev, dev->mem_addr);
 free_device:
 	kfree(dev);